Moved umbraco cshtml files into the umbraco folder

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -67,9 +68,10 @@ namespace Umbraco.Web.BackOffice.Controllers
         [HttpGet]
         public async Task<IActionResult> Default()
         {
+            var viewPath = Path.Combine(_globalSettings.UmbracoPath , Umbraco.Core.Constants.Web.Mvc.BackOfficeArea, nameof(Default) + ".cshtml");
             return await RenderDefaultOrProcessExternalLoginAsync(
-                () => View(),
-                () => View());
+                () => View(viewPath),
+                () => View(viewPath));
         }
 
         /// <summary>

src/Umbraco.Web.Common/Install/InstallController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http.Extensions;
+using System.IO;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using System.Threading.Tasks;
@@ -83,13 +84,14 @@ namespace Umbraco.Web.Common.Install
             ViewData.SetInstallApiBaseUrl(Url.GetInstallerApiUrl());
 
             // get the base umbraco folder
-            ViewData.SetUmbracoBaseFolder(_hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath));
+            var baseFolder = _hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath);
+            ViewData.SetUmbracoBaseFolder(baseFolder);
 
             ViewData.SetUmbracoVersion(_umbracoVersion.SemanticVersion);
 
             await _installHelper.SetInstallStatusAsync(false, "");
 
-            return View();
+            return View(Path.Combine(baseFolder , Umbraco.Core.Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
         }
 
         /// <summary>
@@ -100,7 +102,7 @@ namespace Umbraco.Web.Common.Install
         public ActionResult Redirect()
         {
             var uri = HttpContext.Request.GetEncodedUrl();
-            
+
             // redirect to install
             ReportRuntime(_logger, _runtime.Level, "Umbraco must install or upgrade.");
 

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

@@ -17,6 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <Folder Include="css" />
       <Folder Include="Umbraco" />
       <Folder Include="Views\" />
       <Folder Include="wwwroot\Media" />
@@ -54,14 +55,10 @@
         <Content Remove="wwwroot\Umbraco\views\install\continueinstall.html" />
         <Content Remove="wwwroot\Umbraco\views\install\database.html" />
         <Content Remove="wwwroot\Umbraco\views\install\error.html" />
-        <Content Update="Areas\UmbracoInstall\Views\Install\Index.cshtml">
-          <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-          <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-        </Content>
-        <Content Update="Config\tinyMceConfig.config">
+        <Content Update="config\tinyMceConfig.config">
           <SubType>Designer</SubType>
         </Content>
-        <Content Update="Config\umbracoSettings.config">
+        <Content Update="config\umbracoSettings.config">
           <SubType>Designer</SubType>
         </Content>
         <Content Remove="wwwroot\Web.config" />

src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml

@@ -1,6 +1,4 @@
 @using Umbraco.Core
-@using Umbraco.Web.Composing
-@using Umbraco.Web
 @using Umbraco.Web.WebAssets
 @using Umbraco.Web.Common.Security
 @using Umbraco.Core.WebAssets