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

Merge remote-tracking branch 'origin/netcore/task/6973-migrating-authenticationcontroller' into netcore/task/6973-migrating-authenticationcontroller-merge

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
#	src/Umbraco.Web/Logging/WebProfilerComposer.cs
This commit is contained in:
Bjarke Berg
2020-10-26 14:37:56 +01:00
parent f791bd4426 b47f946ffe
commit 715071a33f
319 changed files with 2620 additions and 5552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.NetCore/Program.cs
View File

@@ -21,6 +21,10 @@ namespace Umbraco.Web.UI.NetCore
x.ClearProviders();
})
.ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
// TODO: MSDI - this should probably be on one day, more so when we can reduce the number
// of times we build a ServiceProvider from services collection
// right now it's just painful.
.UseDefaultServiceProvider(options => options.ValidateOnBuild = false)
.UseUmbraco();
}
}

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

@@ -33,7 +33,10 @@ namespace Umbraco.Web.UI.NetCore
public void ConfigureServices(IServiceCollection services)
{
var umbracoBuilder = services.AddUmbraco(_env, _config);
umbracoBuilder.BuildWithAllBackOfficeComponents();
umbracoBuilder
.WithAllBackOfficeComponents()
.WithAllWebsiteComponents()
.Build();
}