From 3b01daf15aea3b1282d769a6f10af98e58df327c Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Mon, 11 Dec 2017 17:32:30 +0000 Subject: [PATCH] Begin on serving .NET assemblies from ReferencedAssemblyFileProvider --- .../HostedInAspNet.Server.csproj | 2 +- samples/HostedInAspNet.Server/Startup.cs | 2 +- samples/MonoSanity/Startup.cs | 24 +------------------ samples/MonoSanity/wwwroot/index.html | 4 ++-- samples/MonoSanityClient/Examples.cs | 2 +- src/Microsoft.Blazor.Browser/src/Boot.ts | 5 ++-- .../Server/Startup.cs | 2 +- .../BlazorAppBuilderExtensions.cs | 6 +++-- .../ClientFilesystem/ClientFileProvider.cs | 6 +++-- 9 files changed, 17 insertions(+), 36 deletions(-) diff --git a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 8de9dad273..7c7f6fcda4 100644 --- a/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -9,8 +9,8 @@ - + diff --git a/samples/HostedInAspNet.Server/Startup.cs b/samples/HostedInAspNet.Server/Startup.cs index bea85f7bed..576c37f634 100644 --- a/samples/HostedInAspNet.Server/Startup.cs +++ b/samples/HostedInAspNet.Server/Startup.cs @@ -25,7 +25,7 @@ namespace HostedInAspNet.Server app.UseBlazorDevelopmentServer("../HostedInAspNet.Client"); } - app.UseBlazor(); + app.UseBlazor(); } } } diff --git a/samples/MonoSanity/Startup.cs b/samples/MonoSanity/Startup.cs index aa6d8d6245..144ea796f3 100644 --- a/samples/MonoSanity/Startup.cs +++ b/samples/MonoSanity/Startup.cs @@ -15,29 +15,7 @@ namespace MonoSanity { app.UseDeveloperExceptionPage(); app.UseFileServer(); - app.UseBlazor(); - - ServeSingleStaticFile(app, - "/clientBin/MonoSanityClient.dll", - typeof(Examples).Assembly.Location); - } - - private void ServeSingleStaticFile(IApplicationBuilder app, string url, string physicalPath) - { - // This is not implemented efficiently (e.g., doesn't support cache control headers) - // so don't use this in real applications. Use 'UseStaticFiles' or similar instead. - app.Use((context, next) => - { - if (context.Request.Path == url) - { - context.Response.ContentType = MediaTypeNames.Application.Octet; - return File.OpenRead(physicalPath).CopyToAsync(context.Response.Body); - } - else - { - return next(); - } - }); + app.UseBlazor(); } } } diff --git a/samples/MonoSanity/wwwroot/index.html b/samples/MonoSanity/wwwroot/index.html index b0ba50cf6c..52ee7448df 100644 --- a/samples/MonoSanity/wwwroot/index.html +++ b/samples/MonoSanity/wwwroot/index.html @@ -1,4 +1,4 @@ - + Mono sanity check @@ -40,7 +40,7 @@