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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB6455-migrate-surfacecontroller

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-05-12 08:29:39 +02:00
parent 95dd55506a 9e6ed6fb6f
commit cbf7f5ccc3
25 changed files with 431 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,20 +54,10 @@ namespace Umbraco.Web.UI.BackOffice
{
services.AddUmbracoConfiguration(_config);
services.AddUmbracoCore(_env, out var factory);
services.AddUmbracoWebsite();
services.AddUmbracoWebComponents();
services.AddUmbracoRuntimeMinifier(_config);
services.AddMvc(options =>
{
options.Filters.Add<HttpResponseExceptionFilter>();
}).SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
.AddNewtonsoftJson(options =>
{
options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
})
;
services.AddMvc();
services.AddMiniProfiler(options =>
{
@@ -97,19 +87,24 @@ namespace Umbraco.Web.UI.BackOffice
public void Configure(IApplicationBuilder app)
{
//app.UseMiniProfiler();
app.UseUmbracoRequestLifetime();
//app.UseMiniProfiler();
if (_env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}
app.UseStatusCodePages();
app.UseRouting();
app.UseUmbracoRouting();
app.UseUmbracoCore();
app.UseUmbracoRequestLogging();
app.UseUmbracoWebsite();
app.UseUmbracoBackOffice();
app.UseRouting();
app.UseUmbracoBackOffice();
app.UseUmbracoRuntimeMinification();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute("Backoffice", "/umbraco/{Action}", new
@@ -118,7 +113,7 @@ namespace Umbraco.Web.UI.BackOffice
Action = "Default"
});
// TODO: Fix this routing with an area
endpoints.MapControllerRoute("Install", "/install/{controller}/{Action}", defaults:new { Area = "Install"});
//TODO register routing correct: Name must be like this