From 5517186cb780c581cbdd731ebf62bca06bdaef37 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 24 Feb 2020 10:51:48 +0100 Subject: [PATCH] Added Web.Website --- ...oBackOfficeApplicationBuilderExtensions.cs | 2 +- ...ware.cs => UmbracoBackOfficeMiddleware.cs} | 4 ++-- .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Startup.cs | 4 ++++ .../Umbraco.Web.UI.NetCore.csproj} | 2 ++ .../appsettings.Development.json | 0 .../appsettings.json | 0 ...racoWebsiteApplicationBuilderExtensions.cs | 18 ++++++++++++++++ .../AspNetCore/UmbracoWebsiteMiddleware.cs | 21 +++++++++++++++++++ ...bracoWebsiteServiceCollectionExtensions.cs | 13 ++++++++++++ .../Umbraco.Web.Website.csproj | 13 ++++++++++++ src/umbraco.sln | 8 ++++++- 13 files changed, 81 insertions(+), 4 deletions(-) rename src/Umbraco.Web.BackOffice/AspNetCore/{UmbracoMiddleware.cs => UmbracoBackOfficeMiddleware.cs} (78%) rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Program.cs (100%) rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Properties/launchSettings.json (100%) rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/Startup.cs (91%) rename src/{Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj => Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj} (64%) rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/appsettings.Development.json (100%) rename src/{Umbraco.Web.UI.BackOffice => Umbraco.Web.UI.NetCore}/appsettings.json (100%) create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs create mode 100644 src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs create mode 100644 src/Umbraco.Web.Website/Umbraco.Web.Website.csproj diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs index b1339c476f..e395cf579d 100644 --- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore throw new ArgumentNullException(nameof(builder)); } - return builder.UseMiddleware(); + return builder.UseMiddleware(); } } } diff --git a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs similarity index 78% rename from src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs rename to src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs index 8c1eac78dd..89d12718b5 100644 --- a/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoMiddleware.cs +++ b/src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeMiddleware.cs @@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Http; namespace Umbraco.Web.BackOffice.AspNetCore { - public class UmbracoMiddleware + public class UmbracoBackOfficeMiddleware { private readonly RequestDelegate _next; - public UmbracoMiddleware(RequestDelegate next) + public UmbracoBackOfficeMiddleware(RequestDelegate next) { _next = next; } diff --git a/src/Umbraco.Web.UI.BackOffice/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs similarity index 100% rename from src/Umbraco.Web.UI.BackOffice/Program.cs rename to src/Umbraco.Web.UI.NetCore/Program.cs diff --git a/src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json b/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json similarity index 100% rename from src/Umbraco.Web.UI.BackOffice/Properties/launchSettings.json rename to src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json diff --git a/src/Umbraco.Web.UI.BackOffice/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs similarity index 91% rename from src/Umbraco.Web.UI.BackOffice/Startup.cs rename to src/Umbraco.Web.UI.NetCore/Startup.cs index a80f0d0752..8e4da28917 100644 --- a/src/Umbraco.Web.UI.BackOffice/Startup.cs +++ b/src/Umbraco.Web.UI.NetCore/Startup.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Umbraco.Web.BackOffice.AspNetCore; +using Umbraco.Web.Website.AspNetCore; namespace Umbraco.Web.UI.BackOffice @@ -18,6 +19,7 @@ namespace Umbraco.Web.UI.BackOffice // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { + services.AddUmbracoWebsite(); services.AddUmbracoBackOffice(); } @@ -29,7 +31,9 @@ namespace Umbraco.Web.UI.BackOffice app.UseDeveloperExceptionPage(); } + app.UseUmbracoWebsite(); app.UseUmbracoBackOffice(); + app.UseRouting(); app.UseEndpoints(endpoints => diff --git a/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj similarity index 64% rename from src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj rename to src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index b68d2e582e..946e97de00 100644 --- a/src/Umbraco.Web.UI.BackOffice/Umbraco.Web.UI.BackOffice.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -2,10 +2,12 @@ netcoreapp3.1 + Umbraco.Web.UI.BackOffice + diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.Development.json b/src/Umbraco.Web.UI.NetCore/appsettings.Development.json similarity index 100% rename from src/Umbraco.Web.UI.BackOffice/appsettings.Development.json rename to src/Umbraco.Web.UI.NetCore/appsettings.Development.json diff --git a/src/Umbraco.Web.UI.BackOffice/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json similarity index 100% rename from src/Umbraco.Web.UI.BackOffice/appsettings.json rename to src/Umbraco.Web.UI.NetCore/appsettings.json diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs new file mode 100644 index 0000000000..15f136bd6d --- /dev/null +++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs @@ -0,0 +1,18 @@ +using System; +using Microsoft.AspNetCore.Builder; + +namespace Umbraco.Web.Website.AspNetCore +{ + public static class UmbracoBackOfficeApplicationBuilderExtensions + { + public static IApplicationBuilder UseUmbracoWebsite(this IApplicationBuilder builder) + { + if (builder == null) + { + throw new ArgumentNullException(nameof(builder)); + } + + return builder.UseMiddleware(); + } + } +} diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs new file mode 100644 index 0000000000..b33f647dd2 --- /dev/null +++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteMiddleware.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; + +namespace Umbraco.Web.Website.AspNetCore +{ + public class UmbracoWebsiteMiddleware + { + private readonly RequestDelegate _next; + public UmbracoWebsiteMiddleware(RequestDelegate next) + { + _next = next; + } + + public async Task InvokeAsync(HttpContext context) + { + + // Call the next delegate/middleware in the pipeline + await _next(context); + } + } +} diff --git a/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs new file mode 100644 index 0000000000..fc689962a1 --- /dev/null +++ b/src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; + +namespace Umbraco.Web.Website.AspNetCore +{ + public static class UmbracoBackOfficeServiceCollectionExtensions + { + public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services) + { + return services; + } + + } +} diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj new file mode 100644 index 0000000000..55e6b06a87 --- /dev/null +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp3.1 + Library + + + + + + + + diff --git a/src/umbraco.sln b/src/umbraco.sln index 67fac31aa3..457f1869f1 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -117,7 +117,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "U EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.BackOffice", "Umbraco.Web.UI.BackOffice\Umbraco.Web.UI.BackOffice.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -183,6 +185,10 @@ Global {DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.Build.0 = Release|Any CPU + {5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE