Commit Graph

5 Commits

Author SHA1 Message Date
Shannon
1658fced23 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore
# Conflicts:
#	src/Umbraco.Core/IO/IOHelper.cs
#	src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
#	src/Umbraco.Tests.Common/TestHelperBase.cs
#	src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Program.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web/UmbracoApplication.cs
2020-03-23 15:50:01 +11:00
Bjarke Berg
3e75c889ab Imaging settings 2020-03-17 17:56:00 +01:00
Bjarke Berg
51879c0b80 Implemented config for asp.net core 2020-03-16 14:02:08 +01:00
Shannon
9ded4c7ddb Wires up DI for cross wiring correctly ensuring that it occurs at the very end of ConfigureServices, updates tests accordingly, fixes a few other things. 2020-03-13 18:44:58 +11:00
Bjarke Berg
5517186cb7 Added Web.Website 2020-02-24 10:51:48 +01:00