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

Merge remote-tracking branch 'Umbraco/netcore/netcore' into netcore/feature/aspnetcoreidentity

Browse Source
This commit is contained in:
Scott Brady
2020-05-18 12:52:03 +01:00
parent 6f75fe6cc4 287f379c1b
commit 091712e5de
115 changed files with 3285 additions and 16511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web.UI.NetCore/Areas/UmbracoBackOffice/Views/BackOffice/Default.cshtml Normal file
View File

@@ -0,0 +1,17 @@
@{
Layout = null;
}
<!doctype html>
<html lang="en">
<head>
</head>
<body>
<h1>Hello!</h1>
<p>TODO: Import the default.cshtml back office page</p>
</body>
</html>

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

@@ -32,7 +32,14 @@ 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.AddUmbracoConfiguration(_config);
// TODO: We will need to decide on if we want to use the ServiceBasedControllerActivator to create our controllers
// or use the default IControllerActivator: DefaultControllerActivator (which doesn't directly use the container to resolve controllers)
// This will affect whether we need to explicitly register controllers in the container like we do today in v8.
// What we absolutely must do though is make sure we explicitly opt-in to using one or the other *always* for our controllers instead of
// relying on a global configuration set by a user since if a custom IControllerActivator is used for our own controllers we may not
// guarantee it will work. And then... is that even possible?
services.AddUmbracoConfiguration(_config);
services.AddUmbracoCore(_env, out var factory);
services.AddUmbracoWebComponents();
services.AddUmbracoRuntimeMinifier(_config);
@@ -56,7 +63,7 @@ namespace Umbraco.Web.UI.BackOffice
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app)
{
//app.UseMiniProfiler();
//app.UseMiniProfiler();
if (_env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
@@ -71,12 +78,12 @@ namespace Umbraco.Web.UI.BackOffice
app.UseUmbracoWebsite();
app.UseUmbracoBackOffice();
app.UseUmbracoInstaller();
app.UseEndpoints(endpoints =>
{
{
endpoints.MapControllerRoute(
name: "default",
pattern: "{controller}/{action=Index}/{id?}");
pattern: "{controller}/{action=Index}/{id?}");
});
}
}

1
src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
View File

@@ -13,6 +13,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Controllers\" />
<Folder Include="Views\" />
<Folder Include="wwwroot\Media" />
<Folder Include="wwwroot\Umbraco\views\install" />