Kill Microsoft.DotNet.Interactive.Http.dll. (#3214)

Move the code into the dotnet interactive tool instead.
dotnet · Oct 3, 2023 · edad190 · edad190
1 parent 6acf672
commit edad190
Show file tree

Hide file tree

Showing 33 changed files with 25 additions and 94 deletions.
diff --git a/dotnet-interactive.sln b/dotnet-interactive.sln
@@ -62,8 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4DD50BCA-1
 		docs\variable-sharing.md = docs\variable-sharing.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.Http", "src\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj", "{DE942DC3-B41B-45C5-9E01-3C4F042D3916}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.AspNetCore", "src\Microsoft.DotNet.Interactive.AspNetCore\Microsoft.DotNet.Interactive.AspNetCore.csproj", "{5167FC61-2FBF-4E0D-877E-C2DD354FB955}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.SqlServer", "src\Microsoft.DotNet.Interactive.SqlServer\Microsoft.DotNet.Interactive.SqlServer.csproj", "{EBDC3450-C4C0-42C6-8D53-85FEDF897664}"
@@ -119,7 +117,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv
 		{1A4A744F-FEF3-4361-A2E5-C5D496F7BFDC} = {1A4A744F-FEF3-4361-A2E5-C5D496F7BFDC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Interactive.HttpRequestParser", "src\Microsoft.DotNet.Interactive.HttpRequestParser\Microsoft.DotNet.Interactive.HttpRequestParser.csproj", "{DA0B3BFC-ED19-4754-A9A0-0F831DBCC9C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactive.HttpRequestParser", "src\Microsoft.DotNet.Interactive.HttpRequestParser\Microsoft.DotNet.Interactive.HttpRequestParser.csproj", "{DA0B3BFC-ED19-4754-A9A0-0F831DBCC9C4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -359,18 +357,6 @@ Global
 		{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x64.Build.0 = Release|Any CPU
 		{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x86.ActiveCfg = Release|Any CPU
 		{9A091E80-D5EB-4DEF-8E38-B24B128393DF}.Release|x86.Build.0 = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|x64.ActiveCfg = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|x64.Build.0 = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|x86.ActiveCfg = Release|Any CPU
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916}.Release|x86.Build.0 = Release|Any CPU
 		{5167FC61-2FBF-4E0D-877E-C2DD354FB955}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5167FC61-2FBF-4E0D-877E-C2DD354FB955}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5167FC61-2FBF-4E0D-877E-C2DD354FB955}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -719,7 +705,6 @@ Global
 		{CE412E28-8660-43CA-8E0B-293EAC624623} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
 		{30DE6920-EA82-4E4F-BFCA-1FF179FAA2DA} = {11BA3480-4584-435C-BA9A-8C554DB60E9F}
 		{9A091E80-D5EB-4DEF-8E38-B24B128393DF} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
-		{DE942DC3-B41B-45C5-9E01-3C4F042D3916} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
 		{5167FC61-2FBF-4E0D-877E-C2DD354FB955} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
 		{EBDC3450-C4C0-42C6-8D53-85FEDF897664} = {B95A8485-8C53-4F56-B0CE-19C0726B5805}
 		{79FBB52B-BC6B-44F9-9DF0-F58F2DA83EE0} = {11BA3480-4584-435C-BA9A-8C554DB60E9F}

diff --git a/src/Microsoft.DotNet.Interactive.Http/Directory.Build.props b/src/Microsoft.DotNet.Interactive.Http/Directory.Build.props
diff --git a/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj b/src/Microsoft.DotNet.Interactive.Http/Microsoft.DotNet.Interactive.Http.csproj
diff --git a/src/Microsoft.DotNet.Interactive.Http/StaticContentSourceNotFoundException.cs b/src/Microsoft.DotNet.Interactive.Http/StaticContentSourceNotFoundException.cs
diff --git a/src/Microsoft.DotNet.Interactive.Tests/Microsoft.DotNet.Interactive.Tests.csproj b/src/Microsoft.DotNet.Interactive.Tests/Microsoft.DotNet.Interactive.Tests.csproj
@@ -69,7 +69,6 @@
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Formatting.Tests\Microsoft.DotNet.Interactive.Formatting.Tests.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.PowerShell\Microsoft.DotNet.Interactive.PowerShell.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Jupyter\Microsoft.DotNet.Interactive.Jupyter.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Formatting\Microsoft.DotNet.Interactive.Formatting.csproj" />

diff --git a/src/dotnet-interactive.Tests/(Recipes)/LogEvents.cs b/src/dotnet-interactive.Tests/(Recipes)/LogEvents.cs
@@ -18,7 +18,6 @@ public static IDisposable SubscribeToPocketLogger(this ITestOutputHelper output)
             new[]
             {
                 typeof(LogEvents).Assembly,
-                typeof(Startup).Assembly,
                 typeof(CommandLine).Assembly,
                 typeof(CSharpKernel).Assembly,
                 typeof(FSharpKernel).Assembly,

diff --git a/src/dotnet-interactive.Tests/LanguageKernelExtensionLoadingTests.cs b/src/dotnet-interactive.Tests/LanguageKernelExtensionLoadingTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -145,7 +146,7 @@ await kernel.SubmitCodeAsync($@"
 
         Action action = () => provider.GetFileInfo("extensions/TestKernelExtension/resources/file.txt");
 
-        action.Should().Throw<StaticContentSourceNotFoundException>();
+        action.Should().Throw<KeyNotFoundException>();
     }
 
     [Theory]
@@ -179,7 +180,7 @@ public void it_cannot_resolve_unregistered_extensions(Language language)
         Action action
             = () => provider.GetFileInfo("extensions/not_found/resources/file.txt");
 
-        action.Should().Throw<StaticContentSourceNotFoundException>();
+        action.Should().Throw<KeyNotFoundException>();
     }
 
     protected override CompositeKernel CreateCompositeKernel(Language defaultKernelLanguage = Language.CSharp, bool openTestingNamespaces = false)

diff --git a/...tNet.Interactive.Http/AspNetExtensions.cs → ...tnet-interactive/Http/AspNetExtensions.cs b/...tNet.Interactive.Http/AspNetExtensions.cs → ...tnet-interactive/Http/AspNetExtensions.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public static class AspNetExtensions
+internal static class AspNetExtensions
 {
     public static IServiceCollection AddKernel<T>(this IServiceCollection services, T kernel) where T : Kernel
     {

diff --git a/...active.Http/BrowserFrontendEnvironment.cs → ...active/Http/BrowserFrontendEnvironment.cs b/...active.Http/BrowserFrontendEnvironment.cs → ...active/Http/BrowserFrontendEnvironment.cs
diff --git a/...Interactive.Http/ClientExecutionRouter.cs → ...interactive/Http/ClientExecutionRouter.cs b/...Interactive.Http/ClientExecutionRouter.cs → ...interactive/Http/ClientExecutionRouter.cs
diff --git a/...Interactive.Http/ConnectSignalRCommand.cs → ...interactive/Http/ConnectSignalRCommand.cs b/...Interactive.Http/ConnectSignalRCommand.cs → ...interactive/Http/ConnectSignalRCommand.cs
diff --git a/...otNet.Interactive.Http/DiscoveryRouter.cs → ...otnet-interactive/Http/DiscoveryRouter.cs b/...otNet.Interactive.Http/DiscoveryRouter.cs → ...otnet-interactive/Http/DiscoveryRouter.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class DiscoveryRouter : IRouter
+internal class DiscoveryRouter : IRouter
 {
     private readonly HtmlNotebookFrontendEnvironment _frontendEnvironment;
 

diff --git a/...t.DotNet.Interactive.Http/FileProvider.cs → src/dotnet-interactive/Http/FileProvider.cs b/...t.DotNet.Interactive.Http/FileProvider.cs → src/dotnet-interactive/Http/FileProvider.cs
@@ -65,11 +65,7 @@ string ProcessPath()
         IFileProvider SelectProvider()
         {
             var name = parts[1];
-            if (!_providers.TryGetValue(name, out var embeddedFileProvider))
-            {
-                throw new StaticContentSourceNotFoundException(name);
-            }
-            return embeddedFileProvider;
+            return _providers[name];
         }
     }
 

diff --git a/...e.Http/HtmlNotebookFrontendEnvironment.cs → ...e/Http/HtmlNotebookFrontendEnvironment.cs b/...e.Http/HtmlNotebookFrontendEnvironment.cs → ...e/Http/HtmlNotebookFrontendEnvironment.cs
diff --git a/...t.Interactive.Http/HttpApiBootstrapper.cs → ...t-interactive/Http/HttpApiBootstrapper.cs b/...t.Interactive.Http/HttpApiBootstrapper.cs → ...t-interactive/Http/HttpApiBootstrapper.cs
diff --git a/...nteractive.Http/HttpApiTunnelingRouter.cs → ...nteractive/Http/HttpApiTunnelingRouter.cs b/...nteractive.Http/HttpApiTunnelingRouter.cs → ...nteractive/Http/HttpApiTunnelingRouter.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class HttpApiTunnelingRouter : IRouter
+internal class HttpApiTunnelingRouter : IRouter
 {
     private readonly HtmlNotebookFrontendEnvironment _frontendEnvironment;
 

diff --git a/...ft.DotNet.Interactive.Http/HttpOptions.cs → src/dotnet-interactive/Http/HttpOptions.cs b/...ft.DotNet.Interactive.Http/HttpOptions.cs → src/dotnet-interactive/Http/HttpOptions.cs
diff --git a/...osoft.DotNet.Interactive.Http/HttpPort.cs → src/dotnet-interactive/Http/HttpPort.cs b/...osoft.DotNet.Interactive.Http/HttpPort.cs → src/dotnet-interactive/Http/HttpPort.cs
diff --git a/....DotNet.Interactive.Http/HttpPortRange.cs → src/dotnet-interactive/Http/HttpPortRange.cs b/....DotNet.Interactive.Http/HttpPortRange.cs → src/dotnet-interactive/Http/HttpPortRange.cs
diff --git a/...t.Interactive.Http/HttpProbingSettings.cs → ...t-interactive/Http/HttpProbingSettings.cs b/...t.Interactive.Http/HttpProbingSettings.cs → ...t-interactive/Http/HttpProbingSettings.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class HttpProbingSettings
+internal class HttpProbingSettings
 {
     public Uri[] AddressList { get; private set; }
 

diff --git a/...Interactive.Http/HttpRequestExtensions.cs → ...interactive/Http/HttpRequestExtensions.cs b/...Interactive.Http/HttpRequestExtensions.cs → ...interactive/Http/HttpRequestExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.DotNet.Interactive.Http;
 
@@ -17,7 +16,7 @@ internal static class HttpRequestExtensions
     /// </summary>
     /// <param name="request">The <see cref="HttpRequest"/>.</param>
     /// <returns>A New Uri object representing request Uri.</returns>
-    public static Uri GetUri(this HttpRequest request)
+    public static Uri GetUri(this AspNetCore.Http.HttpRequest request)
     {
         if (request == null)
         {

diff --git a/...mandAndEventSignalRHubConnectionSender.cs → ...mandAndEventSignalRHubConnectionSender.cs b/...mandAndEventSignalRHubConnectionSender.cs → ...mandAndEventSignalRHubConnectionSender.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class KernelCommandAndEventSignalRHubConnectionSender : IKernelCommandAndEventSender
+internal class KernelCommandAndEventSignalRHubConnectionSender : IKernelCommandAndEventSender
 {
     // QUESTION: (KernelCommandAndEventSignalRHubConnectionSender) tests?
     private readonly HubConnection _hubConnection;

diff --git a/...tNet.Interactive.Http/KernelExtensions.cs → ...tnet-interactive/Http/KernelExtensions.cs b/...tNet.Interactive.Http/KernelExtensions.cs → ...tnet-interactive/Http/KernelExtensions.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public static class KernelExtensions
+internal static class KernelExtensions
 {
     public static T UseHttpApi<T>(this T kernel, HttpPort httpPort, HttpProbingSettings httpProbingSettings)
         where T : Kernel

diff --git a/...soft.DotNet.Interactive.Http/KernelHub.cs → src/dotnet-interactive/Http/KernelHub.cs b/...soft.DotNet.Interactive.Http/KernelHub.cs → src/dotnet-interactive/Http/KernelHub.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class KernelHub : Hub
+internal class KernelHub : Hub
 {
     private readonly KernelHubConnection _connection;
 

diff --git a/...t.Interactive.Http/KernelHubConnection.cs → ...t-interactive/Http/KernelHubConnection.cs b/...t.Interactive.Http/KernelHubConnection.cs → ...t-interactive/Http/KernelHubConnection.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class KernelHubConnection : IDisposable
+internal class KernelHubConnection : IDisposable
 {
     private readonly CompositeDisposable _disposables = new();
     private readonly SignalRBackchannelKernelClient _backchannelKernelClient;

diff --git a/....DotNet.Interactive.Http/KernelsRouter.cs → src/dotnet-interactive/Http/KernelsRouter.cs b/....DotNet.Interactive.Http/KernelsRouter.cs → src/dotnet-interactive/Http/KernelsRouter.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class KernelsRouter : IRouter
+internal class KernelsRouter : IRouter
 {
     private readonly Kernel _kernel;
 

diff --git a/...et.Interactive.Http/PublishEventRouter.cs → ...et-interactive/Http/PublishEventRouter.cs b/...et.Interactive.Http/PublishEventRouter.cs → ...et-interactive/Http/PublishEventRouter.cs
diff --git a/...ve.Http/SignalRBackchannelKernelClient.cs → ...ve/Http/SignalRBackchannelKernelClient.cs b/...ve.Http/SignalRBackchannelKernelClient.cs → ...ve/Http/SignalRBackchannelKernelClient.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class SignalRBackchannelKernelClient : KernelClientBase
+internal class SignalRBackchannelKernelClient : KernelClientBase
 {
     private IHubContext<KernelHub> _hubContext;
 

diff --git a/...nteractive.Http/SignalRKernelConnector.cs → ...nteractive/Http/SignalRKernelConnector.cs b/...nteractive.Http/SignalRKernelConnector.cs → ...nteractive/Http/SignalRKernelConnector.cs
@@ -11,7 +11,7 @@
 #nullable enable
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class SignalRKernelConnector
+internal class SignalRKernelConnector
 {
     public SignalRKernelConnector(Uri hubUrl)
     {

diff --git a/...ive.Http/Utility/JsonElementExtensions.cs → ...ive/Http/Utility/JsonElementExtensions.cs b/...ive.Http/Utility/JsonElementExtensions.cs → ...ive/Http/Utility/JsonElementExtensions.cs
diff --git a/...DotNet.Interactive.Http/VariableRouter.cs → ...dotnet-interactive/Http/VariableRouter.cs b/...DotNet.Interactive.Http/VariableRouter.cs → ...dotnet-interactive/Http/VariableRouter.cs
@@ -18,7 +18,7 @@
 
 namespace Microsoft.DotNet.Interactive.Http;
 
-public class VariableRouter : IRouter
+internal class VariableRouter : IRouter
 {
     private static readonly JsonSerializerOptions SerializerOptions;
 

diff --git a/src/dotnet-interactive/Startup.cs b/src/dotnet-interactive/Startup.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.DotNet.Interactive.App;
 
-public class Startup
+internal class Startup
 {
     public Startup(
         IHostEnvironment env,

diff --git a/src/dotnet-interactive/dotnet-interactive.csproj b/src/dotnet-interactive/dotnet-interactive.csproj
@@ -45,6 +45,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
@@ -74,7 +75,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.CSharp\Microsoft.DotNet.Interactive.CSharp.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj" />
-    <ProjectReference Include="..\Microsoft.DotNet.Interactive.Http\Microsoft.DotNet.Interactive.Http.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.HttpRequest\Microsoft.DotNet.Interactive.HttpRequest.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.Mermaid\Microsoft.DotNet.Interactive.Mermaid.csproj" />
     <ProjectReference Include="..\Microsoft.DotNet.Interactive.PackageManagement\Microsoft.DotNet.Interactive.PackageManagement.csproj" />
@@ -121,7 +121,7 @@
     <Compile Include="..\Microsoft.DotNet.Interactive.Documents\JsonReaderExtensions.cs" Link="ParserServer\JsonReaderExtensions.cs" />
     <Compile Include="..\Microsoft.DotNet.Interactive.Documents\Json\ByteArrayConverter.cs" Link="ParserServer\ByteArrayConverter.cs" />
     <Compile Include="..\Microsoft.DotNet.Interactive\Utility\DictionaryExtensions.cs" Link="%28Recipes%29\DictionaryExtensions.cs" />
-    <Compile Include="..\Microsoft.DotNet.Interactive\Utility\InvocationContextExtensions.cs" Link="Utility\InvocationContextExtensions.cs" />
+    <Compile Include="..\Microsoft.DotNet.Interactive\Utility\InvocationContextExtensions.cs" Link="Http\Utility\InvocationContextExtensions.cs" />
 
     <TypescriptOutputFiles Include="$(JsApiRoot)dist/dotnet-interactive.js" />
 
@@ -157,6 +157,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Http\" />
+  </ItemGroup>
+
   <Target Name="CopyKernelSpecificFiles" DependsOnTargets="PrepareKernels;CopyLogoFiles">
     <CreateItem Include="%(KernelFolders.Identity)/**/*.json" AdditionalMetadata="Destination=$([System.IO.Path]::GetFileName(%(KernelFolders.Identity)))">
       <Output TaskParameter="Include" ItemName="KernelSpecificJsonFiles" />