diff --git a/build/artifacts.props b/build/artifacts.props index 5fcc2fada6..ef185c5628 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -33,6 +33,7 @@ This can be done once #4246 is complete, and done in conjunction with converting + diff --git a/src/Components/Components.sln b/src/Components/Components.sln index b006b9944b..623004b5bb 100644 --- a/src/Components/Components.sln +++ b/src/Components/Components.sln @@ -98,6 +98,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build", "src\Microsoft.AspNetCore.Components.Build\Microsoft.AspNetCore.Components.Build.csproj", "{ABDBB486-6F40-4EA0-8ED1-BF995F534F13}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Blazor.Server", "blazor\src\Microsoft.AspNetCore.Blazor.Server\Microsoft.AspNetCore.Blazor.Server.csproj", "{EA44F350-F410-41B4-BA21-00CD31D17384}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -344,6 +346,14 @@ Global {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.Release|Any CPU.Build.0 = Release|Any CPU {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU {ABDBB486-6F40-4EA0-8ED1-BF995F534F13}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.Release|Any CPU.Build.0 = Release|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {EA44F350-F410-41B4-BA21-00CD31D17384}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -389,6 +399,7 @@ Global {85813607-297F-4D39-92F7-89379FD80D70} = {32B33872-B599-4913-9F90-EDB5F9E24B18} {E52F5005-26EA-4764-8ECF-41D324AAA6D9} = {B867E038-B3CE-43E3-9292-61568C46CDEB} {ABDBB486-6F40-4EA0-8ED1-BF995F534F13} = {B867E038-B3CE-43E3-9292-61568C46CDEB} + {EA44F350-F410-41B4-BA21-00CD31D17384} = {AD41FFD8-2C0C-4F0C-9537-25C2A3A7A1F4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3} diff --git a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 4a72bd82a7..5e2b98c810 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -21,6 +21,7 @@ + diff --git a/src/Components/blazor/samples/HostedInAspNet.Server/Startup.cs b/src/Components/blazor/samples/HostedInAspNet.Server/Startup.cs index 732ec7f498..ec093272b6 100644 --- a/src/Components/blazor/samples/HostedInAspNet.Server/Startup.cs +++ b/src/Components/blazor/samples/HostedInAspNet.Server/Startup.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Builder; @@ -21,6 +21,7 @@ namespace HostedInAspNet.Server if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); + app.UseBlazorDebugging(); } app.UseBlazor(); diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj index b8cafaa23a..be56d4e617 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Microsoft.AspNetCore.Blazor.Cli.csproj @@ -20,5 +20,6 @@ + diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs index 3623b4473f..4400eb11de 100644 --- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Cli/Server/Startup.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Components.Server; @@ -38,6 +38,7 @@ namespace Microsoft.AspNetCore.Blazor.Cli.Server var clientAssemblyPath = FindClientAssemblyPath(app); app.UseBlazor(new BlazorOptions { ClientAssemblyPath = clientAssemblyPath }); + app.UseBlazorDebugging(); } private static void EnableConfiguredPathbase(IApplicationBuilder app, IConfiguration configuration) diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj new file mode 100644 index 0000000000..f8c5cb8ae7 --- /dev/null +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/Microsoft.AspNetCore.Blazor.Server.csproj @@ -0,0 +1,19 @@ + + + + netstandard2.0 + Runtime server features for ASP.NET Core Blazor applications. + true + + + + + + + + + + + + + diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/MonoDebugProxyAppBuilderExtensions.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/BlazorMonoDebugProxyAppBuilderExtensions.cs similarity index 94% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/MonoDebugProxyAppBuilderExtensions.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/BlazorMonoDebugProxyAppBuilderExtensions.cs index 7cb83ba9a3..7a1edc2d8c 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/MonoDebugProxyAppBuilderExtensions.cs +++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/BlazorMonoDebugProxyAppBuilderExtensions.cs @@ -14,9 +14,16 @@ using WsProxy; namespace Microsoft.AspNetCore.Builder { - internal static class MonoDebugProxyAppBuilderExtensions + /// + /// Provides infrastructure for debugging Blazor applications. + /// + public static class BlazorMonoDebugProxyAppBuilderExtensions { - public static void UseMonoDebugProxy(this IApplicationBuilder app) + /// + /// Adds middleware for needed for debugging Blazor applications + /// inside Chromium dev tools. + /// + public static void UseBlazorDebugging(this IApplicationBuilder app) { app.UseWebSockets(); diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/UpdateSources.cmd b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/UpdateSources.cmd similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/UpdateSources.cmd rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/UpdateSources.cmd diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/DebugStore.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/DebugStore.cs similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/DebugStore.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/DebugStore.cs diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/MonoProxy.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/MonoProxy.cs similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/MonoProxy.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/MonoProxy.cs diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/WsProxy.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/WsProxy.cs similarity index 100% rename from src/Components/src/Microsoft.AspNetCore.Components.Server/MonoDebugProxy/ws-proxy/WsProxy.cs rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Server/MonoDebugProxy/ws-proxy/WsProxy.cs diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs index 9da49135f2..7d45e243f9 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Builder/BlazorApplicationBuilderExtensions.cs @@ -87,12 +87,6 @@ namespace Microsoft.AspNetCore.Builder }); } - // Accept debugger connections - if (config.EnableDebugging) - { - app.UseMonoDebugProxy(); - } - // Finally, use SPA fallback routing (serve default page for anything else, // excluding /_framework/*) app.MapWhen(IsNotFrameworkDir, childAppBuilder => diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj index b80f261c5c..1c9b8cee42 100644 --- a/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/src/Microsoft.AspNetCore.Components.Server/Microsoft.AspNetCore.Components.Server.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -17,9 +17,6 @@ - - -