Merge branch 'netcore/netcore' into netcore/task/Surface-Routing-9717

2021-02-05 13:22:21 +11:00
parent 295e4eb118 b0e0c38720
commit 967c150180
28 changed files with 611 additions and 352 deletions
--- a/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -52,6 +52,7 @@ using Umbraco.Web.Macros;
 using Umbraco.Web.Security;
 using Umbraco.Web.Telemetry;
 using Umbraco.Web.Templates;
+using Umbraco.Web.Website;
 using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;

 namespace Umbraco.Web.Common.DependencyInjection
@@ -274,6 +275,8 @@ namespace Umbraco.Web.Common.DependencyInjection

            builder.Services.AddSingleton<ContentModelBinder>();

+            builder.Services.AddScoped<UmbracoHelper>();
+
            builder.AddHttpClients();

            // TODO: Does this belong in web components??