Merge pull request #7705 from umbraco/netcore/feature/executable-backoffice

NetCore: Executable in .NET Core

src/Umbraco.Core/Configuration/HealthChecks/TrySkipIisCustomErrorsCheck.cs

@@ -13,13 +13,13 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
         Group = "Configuration")]
     public class TrySkipIisCustomErrorsCheck : AbstractConfigCheck
     {
-        private readonly IHostingEnvironment _hostingEnvironment;
+        private readonly Version _iisVersion;
 
         public TrySkipIisCustomErrorsCheck(ILocalizedTextService textService, IIOHelper ioHelper, ILogger logger,
             IHostingEnvironment hostingEnvironment)
             : base(textService, ioHelper, logger)
         {
-            _hostingEnvironment = hostingEnvironment;
+            _iisVersion = hostingEnvironment.IISVersion;
         }
 
         public override string FilePath => "~/Config/umbracoSettings.config";
@@ -33,7 +33,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 // beware! 7.5 and 7.5.0 are not the same thing!
-                var recommendedValue = _hostingEnvironment.IISVersion >= new Version("7.5")
+                var recommendedValue = _iisVersion >= new Version("7.5")
                     ? bool.TrueString.ToLower()
                     : bool.FalseString.ToLower();
                 return new List<AcceptableConfiguration> { new AcceptableConfiguration { IsRecommended =  true, Value = recommendedValue } };
@@ -45,7 +45,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckSuccessMessage",
-                    new[] { Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
 
@@ -54,7 +54,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckErrorMessage",
-                    new[] { CurrentValue, Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { CurrentValue, Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
 
@@ -63,7 +63,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Config
             get
             {
                 return TextService.Localize("healthcheck/trySkipIisCustomErrorsCheckRectifySuccessMessage",
-                    new[] { Values.First(v => v.IsRecommended).Value, _hostingEnvironment.IISVersion.ToString() });
+                    new[] { Values.First(v => v.IsRecommended).Value, _iisVersion.ToString() });
             }
         }
     }

src/Umbraco.Core/Hosting/IHostingEnvironment.cs

@@ -11,8 +11,6 @@ namespace Umbraco.Core.Hosting
         string LocalTempPath { get; }
         string ApplicationVirtualPath { get; }
 
-        int CurrentDomainId { get; }
-
         bool IsDebugMode { get; }
         /// <summary>
         /// Gets a value indicating whether Umbraco is hosted.

src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj

@@ -105,10 +105,6 @@
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
       <Name>Umbraco.Infrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj">
-      <Project>{9b95eef7-63fe-4432-8c63-166be9c1a929}</Project>
-      <Name>Umbraco.Web.BackOffice</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>

src/Umbraco.Tests/Views/web.config

@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<configuration>
+    <configSections>
+        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+
+    <system.web.webPages.razor>
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <pages pageBaseType="System.Web.Mvc.WebViewPage">
+            <namespaces>
+                <add namespace="System.Web.Mvc" />
+                <add namespace="System.Web.Mvc.Ajax" />
+                <add namespace="System.Web.Mvc.Html" />
+                <add namespace="System.Web.Routing" />
+                <add namespace="Umbraco.Web" />
+                <add namespace="Umbraco.Core" />
+                <add namespace="Umbraco.Core.Models" />
+                <add namespace="Umbraco.Core.Models.PublishedContent" />
+                <add namespace="Umbraco.Web.Mvc" />
+                <add namespace="Examine" />
+                <add namespace="Umbraco.Web.PublishedModels" />
+            </namespaces>
+        </pages>
+    </system.web.webPages.razor>
+
+    <appSettings>
+        <add key="webpages:Enabled" value="false" />
+    </appSettings>
+
+    <system.webServer>
+        <handlers>
+            <remove name="BlockViewHandler"/>
+            <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
+        </handlers>
+    </system.webServer>
+
+    <system.web>
+        <compilation targetFramework="4.7.2">
+            <assemblies>
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
+                <!--
+                    Views are compiled by the Microsoft.CodeDom.Providers.DotNetCompilerPlatform which uses the Roslyn compiler
+                    from ~/bin/roslyn to expose an ICodeProvider implementation to System.CodeDom.
+
+                    For instance, starting with package 1.4.0 (which contains version 1.2.2.0) System.Collections.Immutable
+                    lists netstandard2.0 as a supported target, whereas package 1.3.1 only listed net45. So now, when
+                    installing, NuGet picks the netstandard2.0 version, thus introducing a dependency to netstandard2.0.
+                    
+                    Somehow, transitive dependencies are not working correctly, and either (a) NuGet fails to properly
+                    register this dependency, or (b) when reference assemblies are gathered before compiling views, this
+                    dependency is missed. In any case, the result is that the ICodeProvider is passed a list of referenced
+                    assemblies that is missing .NET Standard.
+
+                    It may be a mix of both. NuGet registers the dependency well enough, that we can actually build the
+                    whole application - but it is not doing something that is required in order to have .NET Standard
+                    being a dependency when building views.
+
+                    See also: https://stackoverflow.com/questions/50165910
+
+                    Funny enough, the CSharpCompiler already explicitly adds System.Runtime as a referenced assembly,
+                    with a comment mentioning an issue. But it's not adding .NET Standard. So, for the time being, to be sure,
+                    we are adding both here.
+                -->
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+                <add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />                
+            </assemblies>
+        </compilation>
+    </system.web>
+</configuration>

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreBackOfficeInfo.cs

@@ -0,0 +1,16 @@
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreBackOfficeInfo : IBackOfficeInfo
+    {
+        public AspNetCoreBackOfficeInfo(IGlobalSettings globalSettings)
+        {
+            GetAbsoluteUrl = globalSettings.UmbracoPath;
+        }
+
+        public string GetAbsoluteUrl { get; }
+
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHostingEnvironment.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Threading;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreHostingEnvironment : Umbraco.Core.Hosting.IHostingEnvironment
+    {
+        private readonly ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper> _registeredObjects =
+            new ConcurrentDictionary<IRegisteredObject, RegisteredObjectWrapper>();
+
+        private readonly IHostingSettings _hostingSettings;
+        private readonly IWebHostEnvironment _webHostEnvironment;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+        private string _localTempPath;
+
+        public AspNetCoreHostingEnvironment(IHostingSettings hostingSettings, IWebHostEnvironment webHostEnvironment, IHttpContextAccessor httpContextAccessor, IHostApplicationLifetime hostHostApplicationLifetime)
+        {
+            _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings));
+            _webHostEnvironment = webHostEnvironment;
+            _httpContextAccessor = httpContextAccessor;
+            _hostApplicationLifetime = hostHostApplicationLifetime;
+
+            SiteName = webHostEnvironment.ApplicationName;
+            ApplicationId = AppDomain.CurrentDomain.Id.ToString();
+            ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
+
+            ApplicationVirtualPath = "/"; //TODO how to find this, This is a server thing, not application thing.
+             IISVersion = new Version(0, 0); // TODO not necessary IIS
+            IsDebugMode =  _hostingSettings.DebugMode;
+        }
+        public bool IsHosted { get; } = true;
+        public string SiteName { get; }
+        public string ApplicationId { get; }
+        public string ApplicationPhysicalPath { get; }
+
+        public string ApplicationVirtualPath { get; }
+        public bool IsDebugMode { get; }
+
+        public Version IISVersion { get; }
+        public string LocalTempPath
+        {
+            get
+            {
+                if (_localTempPath != null)
+                    return _localTempPath;
+
+                switch (_hostingSettings.LocalTempStorageLocation)
+                {
+                    case LocalTempStorage.AspNetTemp:
+                         return _localTempPath = System.IO.Path.Combine(Path.GetTempPath(),ApplicationId,  "UmbracoData");
+
+                    case LocalTempStorage.EnvironmentTemp:
+
+                        // environment temp is unique, we need a folder per site
+
+                        // use a hash
+                        // combine site name and application id
+                        //  site name is a Guid on Cloud
+                        //  application id is eg /LM/W3SVC/123456/ROOT
+                        // the combination is unique on one server
+                        // and, if a site moves from worker A to B and then back to A...
+                        //  hopefully it gets a new Guid or new application id?
+
+                        var hashString = SiteName + "::" + ApplicationId;
+                        var hash = hashString.GenerateHash();
+                        var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
+
+                        return _localTempPath = siteTemp;
+
+                    //case LocalTempStorage.Default:
+                    //case LocalTempStorage.Unknown:
+                    default:
+                        return _localTempPath = MapPath("~/App_Data/TEMP");
+                }
+            }
+        }
+
+
+        public string MapPath(string path) => Path.Combine(_webHostEnvironment.WebRootPath, path);
+
+        public string ToAbsolute(string virtualPath, string root)
+        {
+            if (Uri.TryCreate(virtualPath, UriKind.Absolute, out _))
+            {
+                return virtualPath;
+            }
+
+            var segment = new PathString(virtualPath.Substring(1));
+            var applicationPath = _httpContextAccessor.HttpContext.Request.PathBase;
+
+            return applicationPath.Add(segment).Value;
+        }
+
+        public void RegisterObject(IRegisteredObject registeredObject)
+        {
+            var wrapped = new RegisteredObjectWrapper(registeredObject);
+            if (!_registeredObjects.TryAdd(registeredObject, wrapped))
+            {
+                throw new InvalidOperationException("Could not register object");
+            }
+
+            var cancellationTokenRegistration = _hostApplicationLifetime.ApplicationStopping.Register(() => wrapped.Stop(true));
+            wrapped.CancellationTokenRegistration = cancellationTokenRegistration;
+        }
+
+        public void UnregisterObject(IRegisteredObject registeredObject)
+        {
+            if (_registeredObjects.TryGetValue(registeredObject, out var wrapped))
+            {
+                wrapped.CancellationTokenRegistration.Unregister();
+            }
+        }
+
+
+        private class RegisteredObjectWrapper
+        {
+            private readonly IRegisteredObject _inner;
+
+            public RegisteredObjectWrapper(IRegisteredObject inner)
+            {
+                _inner = inner;
+            }
+
+            public CancellationTokenRegistration CancellationTokenRegistration { get; set; }
+
+            public void Stop(bool immediate)
+            {
+                _inner.Stop(immediate);
+            }
+        }
+    }
+
+
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreHttpContextAccessor.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetCoreHttpContextAccessor //: IHttpContextAccessor
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreHttpContextAccessor(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public HttpContext HttpContext => _httpContextAccessor.HttpContext;
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreIpResolver.cs

@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetIpResolver : IIpResolver
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetIpResolver(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetCurrentRequestIpAddress() => _httpContextAccessor?.HttpContext?.Connection?.RemoteIpAddress?.ToString() ?? string.Empty;
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreMarchal.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.InteropServices;
+using Umbraco.Core.Diagnostics;
+
+namespace Umbraco.Web.BackOffice
+{
+
+    public class AspNetCoreMarchal : IMarchal
+    {
+        // This thing is not available in net standard, but exists in both .Net 4 and .Net Core 3
+        public IntPtr GetExceptionPointers() => Marshal.GetExceptionPointers();
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreSessionIdResolver.cs

@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    internal class AspNetCoreSessionIdResolver : ISessionIdResolver
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreSessionIdResolver(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string SessionId => _httpContextAccessor?.HttpContext.Session?.Id;
+    }
+}

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

@@ -0,0 +1,36 @@
+using System.Threading;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Net;
+
+namespace Umbraco.Web.AspNet
+{
+    public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+
+        public AspNetCoreUmbracoApplicationLifetime(IHttpContextAccessor httpContextAccessor, IHostApplicationLifetime hostApplicationLifetime)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _hostApplicationLifetime = hostApplicationLifetime;
+        }
+
+        public bool IsRestarting { get; set; }
+        public void Restart()
+        {
+            IsRestarting = true;
+
+            var httpContext = _httpContextAccessor.HttpContext;
+            if (httpContext != null)
+            {
+                // unload app domain - we must null out all identities otherwise we get serialization errors
+                // http://www.zpqrtbnk.net/posts/custom-iidentity-serialization-issue
+                httpContext.User = null;
+            }
+
+            Thread.CurrentPrincipal = null;
+            _hostApplicationLifetime.StopApplication();
+        }
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUserAgentProvider.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Http;
+using Umbraco.Net;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public class AspNetCoreUserAgentProvider : IUserAgentProvider
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public AspNetCoreUserAgentProvider(IHttpContextAccessor httpContextAccessor)
+        {
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public string GetUserAgent()
+        {
+            return _httpContextAccessor.HttpContext.Request.Headers["User-Agent"].ToString();
+        }
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeApplicationBuilderExtensions.cs

@@ -0,0 +1,18 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public static class UmbracoBackOfficeApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoBackOffice(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+            return app;
+        }
+    }
+}

src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs

@@ -0,0 +1,55 @@
+using System.Configuration;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Composing;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Logging.Serilog;
+using Umbraco.Core.Runtime;
+
+namespace Umbraco.Web.BackOffice.AspNetCore
+{
+    public static class UmbracoBackOfficeServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoBackOffice(this IServiceCollection services)
+        {
+
+
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+            CreateCompositionRoot(services);
+
+            return services;
+        }
+
+
+        private static void CreateCompositionRoot(IServiceCollection services)
+        {
+            var serviceProvider = services.BuildServiceProvider();
+
+            var httpContextAccessor = serviceProvider.GetService<IHttpContextAccessor>();
+            var webHostEnvironment = serviceProvider.GetService<IWebHostEnvironment>();
+            var hostApplicationLifetime = serviceProvider.GetService<IHostApplicationLifetime>();
+
+            var configFactory = new ConfigsFactory();
+
+            var hostingSettings = configFactory.HostingSettings;
+            var coreDebug = configFactory.CoreDebug;
+
+            var hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment, httpContextAccessor, hostApplicationLifetime);
+            var ioHelper = new IOHelper(hostingEnvironment);
+            var configs = configFactory.Create(ioHelper);
+
+            var logger = SerilogLogger.CreateWithDefaultConfiguration(hostingEnvironment,  new AspNetCoreSessionIdResolver(httpContextAccessor), () => services.BuildServiceProvider().GetService<IRequestCache>(), coreDebug, ioHelper, new AspNetCoreMarchal());
+            var backOfficeInfo = new AspNetCoreBackOfficeInfo(configs.Global());
+            var profiler = new LogProfiler(logger);
+
+            Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
+        }
+    }
+}

src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj

@@ -1,13 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
         <LangVersion>8</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
-      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+        <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
     </ItemGroup>
 
 </Project>

src/Umbraco.Web.UI.NetCore/Program.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Umbraco.Web.UI.BackOffice
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args)
+                .Build()
+                .Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+    }
+}

src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false, 
+    "anonymousAuthentication": true, 
+    "iisExpress": {
+      "applicationUrl": "http://localhost:36804",
+      "sslPort": 44354
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Umbraco.Web.UI.BackOffice": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

src/Umbraco.Web.UI.NetCore/Startup.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Umbraco.Web.BackOffice.AspNetCore;
+using Umbraco.Web.Website.AspNetCore;
+
+
+namespace Umbraco.Web.UI.BackOffice
+{
+    public class Startup
+    {
+        // This method gets called by the runtime. Use this method to add services to the container.
+        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public void ConfigureServices(IServiceCollection services)
+        {
+            services.AddUmbracoWebsite();
+            services.AddUmbracoBackOffice();
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            app.UseUmbracoWebsite();
+            app.UseUmbracoBackOffice();
+
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapGet("/", async context => { await context.Response.WriteAsync("Hello World!"); });
+            });
+        }
+    }
+}

src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <RootNamespace>Umbraco.Web.UI.BackOffice</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+      <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="wwwroot\Media" />
+    </ItemGroup>
+
+</Project>

src/Umbraco.Web.UI.NetCore/appsettings.Development.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

src/Umbraco.Web.UI.NetCore/appsettings.json

@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -128,10 +128,6 @@
       <Project>{f6de8da0-07cc-4ef2-8a59-2bc81dbb3830}</Project>
       <Name>Umbraco.PublishedCache.NuCache</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj">
-      <Project>{9b95eef7-63fe-4432-8c63-166be9c1a929}</Project>
-      <Name>Umbraco.Web.BackOffice</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
       <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
       <Name>Umbraco.Web</Name>

src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteApplicationBuilderExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+
+namespace Umbraco.Web.Website.AspNetCore
+{
+    public static class UmbracoBackOfficeApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseUmbracoWebsite(this IApplicationBuilder app)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException(nameof(app));
+            }
+
+
+            // Important we handle image manipulations before the static files, otherwise the querystring is just ignored.
+            app.UseImageSharp();
+            app.UseStaticFiles();
+
+            return app;
+        }
+    }
+}

src/Umbraco.Web.Website/AspNetCore/UmbracoWebsiteServiceCollectionExtensions.cs

@@ -0,0 +1,17 @@
+using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+
+namespace Umbraco.Web.Website.AspNetCore
+{
+    public static class UmbracoBackOfficeServiceCollectionExtensions
+    {
+        public static IServiceCollection AddUmbracoWebsite(this IServiceCollection services)
+        {
+            services.AddImageSharp();
+
+
+            return services;
+        }
+
+    }
+}

src/Umbraco.Web.Website/Umbraco.Web.Website.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <OutputType>Library</OutputType>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+        <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
+    </ItemGroup>
+</Project>

src/Umbraco.Web/AspNet/AspNetHostingEnvironment.cs

@@ -26,12 +26,9 @@ namespace Umbraco.Web.Hosting
             ApplicationId = HostingEnvironment.ApplicationID;
             ApplicationPhysicalPath = HostingEnvironment.ApplicationPhysicalPath;
             ApplicationVirtualPath = HostingEnvironment.ApplicationVirtualPath;
-            CurrentDomainId = AppDomain.CurrentDomain.Id;
             IISVersion = HttpRuntime.IISVersion;
         }
 
-        public int CurrentDomainId { get; }
-
         public string SiteName { get; }
         public string ApplicationId { get; }
         public string ApplicationPhysicalPath { get; }

src/Umbraco.Web/Runtime/WebRuntime.cs

@@ -26,7 +26,6 @@ namespace Umbraco.Web.Runtime
         /// <summary>
         /// Initializes a new instance of the <see cref="WebRuntime"/> class.
         /// </summary>
-        /// <param name="umbracoApplication"></param>
         public WebRuntime(
             Configs configs,
             IUmbracoVersion umbracoVersion,
@@ -39,6 +38,7 @@ namespace Umbraco.Web.Runtime
             IMainDom mainDom):
             base(configs, umbracoVersion, ioHelper, logger, profiler ,new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, dbProviderFactoryCreator, mainDom)
         {
+
             Profiler = GetWebProfiler();
         }
 

src/umbraco.sln

@@ -117,6 +117,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -177,6 +181,14 @@ Global
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B95EEF7-63FE-4432-8C63-166BE9C1A929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A246D54-3109-4D2B-BE7D-FC0787D126AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE