Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/models-builder-9789

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs

src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs

@@ -1,11 +1,9 @@
-using System;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Core.Hosting;
 
 namespace Umbraco.Web.Common.AspNetCore
 {
-    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime, IUmbracoApplicationLifetimeManager
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
     {
         private readonly IHostApplicationLifetime _hostApplicationLifetime;
 
@@ -21,13 +19,5 @@ namespace Umbraco.Web.Common.AspNetCore
             IsRestarting = true;
             _hostApplicationLifetime.StopApplication();
         }
-
-        public void InvokeApplicationInit()
-        {
-            ApplicationInit?.Invoke(this, EventArgs.Empty);
-        }
-
-        // TODO: Should be killed and replaced with UmbracoApplicationStarting notifications
-        public event EventHandler ApplicationInit;
     }
 }

src/Umbraco.Web.Common/AspNetCore/UmbracoViewPage.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
@@ -8,6 +6,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Core;
@@ -69,6 +68,11 @@ namespace Umbraco.Web.Common.AspNetCore
             {
                 WriteLiteral(htmlEncodedString.ToHtmlString());
             }
+            else if (value is TagHelperOutput tagHelperOutput)
+            {
+                WriteUmbracoContent(tagHelperOutput);
+                base.Write(value);
+            }
             else
             {
                 base.Write(value);
@@ -76,18 +80,16 @@ namespace Umbraco.Web.Common.AspNetCore
         }
 
         /// <inheritdoc/>
-        public override void WriteLiteral(object value)
+        public void WriteUmbracoContent(TagHelperOutput tagHelperOutput)
         {
             // filter / add preview banner
             // ASP.NET default value is text/html
-            if (Context.Response.ContentType.InvariantEquals("text/html"))
+            if (Context.Response.ContentType.InvariantContains("text/html"))
             {
                 if (UmbracoContext.IsDebug || UmbracoContext.InPreviewMode)
                 {
-                    var text = value.ToString();
-                    var pos = text.IndexOf("</body>", StringComparison.InvariantCultureIgnoreCase);
 
-                    if (pos > -1)
+                    if (tagHelperOutput.TagName.Equals("body", StringComparison.InvariantCultureIgnoreCase))
                     {
                         string markupToInject;
 
@@ -107,16 +109,10 @@ namespace Umbraco.Web.Common.AspNetCore
                             markupToInject = ProfilerHtml.Render();
                         }
 
-                        var sb = new StringBuilder(text);
-                        sb.Insert(pos, markupToInject);
-
-                        WriteLiteral(sb.ToString());
-                        return;
+                        tagHelperOutput.Content.AppendHtml(markupToInject);
                     }
                 }
             }
-
-            base.WriteLiteral(value);
         }
 
         /// <summary>