yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
This commit is contained in:
Bjarke Berg
2020-03-24 19:38:44 +01:00
parent 9cca16d31b bcc8dff862
commit 397b25f9ae
42 changed files with 910 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -25,8 +25,8 @@ namespace Umbraco.Web.UI.BackOffice
services.AddUmbracoConfiguration();
services.AddUmbracoRequest();
services.AddUmbracoCore();
services.AddUmbracoWebsite();
services.AddUmbracoBackOffice();
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.