diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index fce15eb487..6e00e02bbe 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -2,60 +2,97 @@
UmbracoCms.Core
- 8.0.0
+ 9.0.0
Umbraco Cms Core Binaries
Umbraco HQ
Umbraco HQ
- http://opensource.org/licenses/MIT
- http://umbraco.com/
+ MIT
+ https://umbraco.com/
https://umbraco.com/dist/nuget/logo-small.png
false
- Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.
+ Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.
Contains the core assemblies needed to run Umbraco Cms
en-US
umbraco
-
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index cfab130f0c..dcbc547b6d 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -2,66 +2,59 @@
UmbracoCms.Web
- 8.0.0
+ 9.0.0
Umbraco Cms Core Binaries
Umbraco HQ
Umbraco HQ
- http://opensource.org/licenses/MIT
- http://umbraco.com/
+ MIT
+ https://umbraco.com/
https://umbraco.com/dist/nuget/logo-small.png
false
- Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.
+ Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.
Contains the core assemblies needed to run Umbraco Cms
en-US
umbraco
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a6b06d9964..5db3a439d9 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -2,67 +2,41 @@
UmbracoCms
- 8.0.0
+ 9.0.0
Umbraco Cms
Umbraco HQ
Umbraco HQ
- http://opensource.org/licenses/MIT
- http://umbraco.com/
+ MIT
+ https://umbraco.com/
https://umbraco.com/dist/nuget/logo-small.png
false
- Installs Umbraco Cms in your Visual Studio ASP.NET project
- Installs Umbraco Cms in your Visual Studio ASP.NET project
+ Installs Umbraco Cms in your Visual Studio ASP.NET Core project
+ Installs Umbraco Cms in your Visual Studio ASP.NET Core project
en-US
umbraco
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/build/NuSpecs/build/UmbracoCms.props b/build/NuSpecs/build/UmbracoCms.props
index 1422a4cd76..371b0aa5ab 100644
--- a/build/NuSpecs/build/UmbracoCms.props
+++ b/build/NuSpecs/build/UmbracoCms.props
@@ -1,13 +1,7 @@
-
-
-
-
- AddUmbracoFilesToOutput;
- $(CopyAllFilesToSingleFolderForPackageDependsOn);
-
-
- AddUmbracoFilesToOutput;
- $(CopyAllFilesToSingleFolderForPackageDependsOn);
-
-
-
\ No newline at end of file
+
+
+
+ $(DefaultItemExcludes);wwwroot\is-cache\**;wwwroot\ms-cache\**
+
+
+
diff --git a/build/NuSpecs/build/UmbracoCms.targets b/build/NuSpecs/build/UmbracoCms.targets
index ac0e9e976d..29d972d480 100644
--- a/build/NuSpecs/build/UmbracoCms.targets
+++ b/build/NuSpecs/build/UmbracoCms.targets
@@ -1,58 +1,20 @@
-
-
-
+
+
- $(MSBuildThisFileDirectory)..\UmbracoFiles\
+ $(MSBuildThisFileDirectory)..\content\**\*.*
-
-
-
-
-
-
-
-
-
- $(MSBuildThisFileDirectory)..\UmbracoFiles\
-
-
-
-
-
-
-
-
-
-
- App_Browsers
-
-
- App_Code
-
-
- App_Plugins
-
-
- bin\amd64
-
-
- bin\x86
-
-
- Config\Splashes
-
-
- data
-
-
- umbraco
-
-
- .
-
-
- %(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/build-bootstrap.ps1 b/build/build-bootstrap.ps1
index 82c789ff22..645f6c7d41 100644
--- a/build/build-bootstrap.ps1
+++ b/build/build-bootstrap.ps1
@@ -34,6 +34,7 @@
if (-not (test-path $nuget))
{
Write-Host "Download NuGet..."
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-WebRequest $source -OutFile $nuget
if (-not $?) { throw "Failed to download NuGet." }
}
diff --git a/build/build.ps1 b/build/build.ps1
index c2c5bdd232..6468ecf571 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -152,7 +152,7 @@
$buildConfiguration = "Release"
$src = "$($this.SolutionRoot)\src"
- $log = "$($this.BuildTemp)\msbuild.umbraco.log"
+ $log = "$($this.BuildTemp)\build.umbraco.log"
if ($this.BuildEnv.VisualStudio -eq $null)
{
@@ -162,23 +162,33 @@
Write-Host "Compile Umbraco"
Write-Host "Logging to $log"
- # beware of the weird double \\ at the end of paths
- # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
- &$this.BuildEnv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
- /p:WarningLevel=0 `
- /p:Configuration=$buildConfiguration `
- /p:Platform=AnyCPU `
- /p:UseWPP_CopyWebApplication=True `
- /p:PipelineDependsOnBuild=False `
- /p:OutDir="$($this.BuildTemp)\bin\\" `
- /p:WebProjectOutputDir="$($this.BuildTemp)\WebApp\\" `
- /p:Verbosity=minimal `
- /t:Clean`;Rebuild `
- /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
- /p:UmbracoBuild=True `
+ & dotnet build "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+ --configuration $buildConfiguration `
+ --output "$($this.BuildTemp)\bin\\" `
> $log
- if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
+ # get files into WebApp\bin
+ & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+ --output "$($this.BuildTemp)\WebApp\bin\\" `
+ > $log
+
+ # remove extra files
+ $webAppBin = "$($this.BuildTemp)\WebApp\bin"
+ $excludeDirs = @("$($webAppBin)\Config","$($webAppBin)\refs","$($webAppBin)\runtimes","$($webAppBin)\Umbraco","$($webAppBin)\wwwroot")
+ $excludeFiles = @("$($webAppBin)\appsettings.*","$($webAppBin)\*.deps.json","$($webAppBin)\*.exe","$($webAppBin)\*.config","$($webAppBin)\*.runtimeconfig.json")
+ $this.RemoveDirectory($excludeDirs)
+ $this.RemoveFile($excludeFiles)
+
+ # copy rest of the files into WebApp
+ $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Config", "*", "$($this.BuildTemp)\WebApp\config")
+ $this.RemoveFile("$($this.BuildTemp)\WebApp\Config\*.Release.*")
+ $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco")
+ $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\Umbraco\config","$($this.BuildTemp)\WebApp\Umbraco\lib")
+ $this.RemoveDirectory($excludeUmbracoDirs)
+ $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Views", "*", "$($this.BuildTemp)\WebApp\Views")
+ Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\appsettings.json" "$($this.BuildTemp)\WebApp"
+
+ if (-not $?) { throw "Failed to compile Umbraco.Web.UI.NetCore." }
# /p:UmbracoBuild tells the csproj that we are building from PS, not VS
})
@@ -253,7 +263,7 @@
$buildConfiguration = "Release"
# restore web.config
- $this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
+ #$this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
# cleanup build
Write-Host "Clean build"
@@ -282,10 +292,10 @@
{ -not $_.RelativeName.StartsWith("imageprocessor") })
$this.CopyFiles("$tmp\WebApp\config", "*.js", "$tmp\Configs")
$this.CopyFiles("$tmp\WebApp\config\lang", "*.xml", "$tmp\Configs\Lang")
- $this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
+ #$this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
- Write-Host "Copy transformed web.config"
- $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
+ # Write-Host "Copy transformed web.config"
+ # $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
# offset the modified timestamps on all umbraco dlls, as WebResources
# break if date is in the future, which, due to timezone offsets can happen.
@@ -302,17 +312,17 @@
{
$nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
}
- $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
- $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
- $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
- $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
+ #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
+ #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
+ #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
+ #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
# copy Belle
Write-Host "Copy Belle"
- $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets")
- $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\js", "*", "$tmp\WebApp\umbraco\js")
- $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib")
- $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\views", "*", "$tmp\WebApp\umbraco\views")
+ $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets")
+ $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js")
+ $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib")
+ $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views")
})
$ubuild.DefineMethod("PackageZip",
@@ -365,15 +375,6 @@
}
})
- $ubuild.DefineMethod("PrepareNuGet",
- {
- Write-Host "Prepare NuGet"
-
- # add Web.config transform files to the NuGet package
- Write-Host "Add web.config transforms to NuGet package"
- mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform"
-
- })
$nugetsourceUmbraco = "https://api.nuget.org/v3/index.json"
@@ -460,7 +461,7 @@
$src = "$($this.SolutionRoot)\src"
$out = $this.BuildOutput
- # Check if the solution has been built
+ # Check if the solution has been built
if (!(Test-Path "$src\Umbraco.Web.UI.Client\node_modules")) {throw "Umbraco needs to be built before generating the Angular Docs"}
"Moving to Umbraco.Web.UI.Docs folder"
@@ -471,7 +472,7 @@
& npx gulp docs
Pop-Location
-
+
# change baseUrl
$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
$IndexPath = "./api/index.html"
@@ -504,8 +505,6 @@
if ($this.OnError()) { return }
$this.VerifyNuGet()
if ($this.OnError()) { return }
- $this.PrepareNuGet()
- if ($this.OnError()) { return }
$this.PackageNuGet()
if ($this.OnError()) { return }
$this.PrepareAzureGallery()
diff --git a/src/Umbraco.Configuration/Models/ContentSettings.cs b/src/Umbraco.Configuration/Models/ContentSettings.cs
index bf046a1376..6c9b986dd1 100644
--- a/src/Umbraco.Configuration/Models/ContentSettings.cs
+++ b/src/Umbraco.Configuration/Models/ContentSettings.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Configuration.Models
_configuration.GetValue(Prefix+"ShowDeprecatedPropertyEditors", false);
public string LoginBackgroundImage =>
- _configuration.GetValue(Prefix+"LoginBackgroundImage", string.Empty);
+ _configuration.GetValue(Prefix+"LoginBackgroundImage", "assets/img/login.jpg");
private class ContentErrorPage : IContentErrorPage
{
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 2337ea24f8..938b089225 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -5,6 +5,10 @@
8
+
+ bin\Release\Umbraco.Configuration.xml
+
+
diff --git a/src/Umbraco.Core/Composing/ReferenceResolver.cs b/src/Umbraco.Core/Composing/ReferenceResolver.cs
index c0334674a3..b6bd121be7 100644
--- a/src/Umbraco.Core/Composing/ReferenceResolver.cs
+++ b/src/Umbraco.Core/Composing/ReferenceResolver.cs
@@ -62,7 +62,7 @@ namespace Umbraco.Core.Composing
// don't include this item if it's Umbraco
// TODO: We should maybe pass an explicit list of these names in?
- if (assemblyName.FullName.StartsWith("Umbraco."))
+ if (assemblyName.FullName.StartsWith("Umbraco.") || assemblyName.Name.EndsWith(".Views"))
continue;
var assembly = Assembly.Load(assemblyName);
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 53e6fe3fbc..58f8c840dc 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -10,6 +10,10 @@
Umbraco CMS
+
+ bin\Release\Umbraco.Core.xml
+
+
diff --git a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
index 9c3516e712..3e6606e965 100644
--- a/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
+++ b/src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/NotificationMethodBase.cs
@@ -19,8 +19,7 @@ namespace Umbraco.Web.HealthCheck.NotificationMethods
}
var notificationMethods = healthCheckSettingsConfig.NotificationSettings.NotificationMethods;
- var notificationMethod = notificationMethods[attribute.Alias];
- if (notificationMethod == null)
+ if(!notificationMethods.TryGetValue(attribute.Alias, out var notificationMethod))
{
Enabled = false;
return;
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index 1af8ce9119..e93923a688 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -5,6 +5,10 @@
8
+
+ bin\Release\Umbraco.Infrastructure.xml
+
+
diff --git a/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj
index 8b4ac02a5c..b6e81ce2bd 100644
--- a/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj
+++ b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj
@@ -5,6 +5,10 @@
net472
+
+ bin\Release\Umbraco.Persistance.SqlCe.xml
+
+
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 75eeca268b..f0f7d32835 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -6,6 +6,10 @@
8
+
+ bin\Release\Umbraco.PublishedCache.NuCache.xml
+
+
diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
index 081f05fbce..c17e977951 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
+++ b/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 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));
}
///
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 911a157223..0f48051848 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -6,6 +6,10 @@
8
+
+ bin\Release\Umbraco.Web.BackOffice.xml
+
+
diff --git a/src/Umbraco.Web.Common/Install/InstallController.cs b/src/Umbraco.Web.Common/Install/InstallController.cs
index 8ba88a423a..2b9f716516 100644
--- a/src/Umbraco.Web.Common/Install/InstallController.cs
+++ b/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"));
}
///
@@ -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.");
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
index 9f6509cd82..60c6bcd47f 100644
--- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -6,6 +6,10 @@
8
+
+ bin\Release\Umbraco.Web.Common.xml
+
+
diff --git a/src/Umbraco.Web.UI/config/Lang/cs-CZ.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/cs-CZ.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/cs-CZ.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/cs-CZ.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/da-DK.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/da-DK.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/da-DK.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/da-DK.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/de-DE.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/de-DE.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/de-DE.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/de-DE.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/en-GB.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/en-GB.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/en-GB.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/en-GB.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/en-US.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/en-US.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/en-US.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/en-US.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/es-ES.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/es-ES.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/es-ES.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/es-ES.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/fr-FR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/fr-FR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/fr-FR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/fr-FR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/he-IL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/he-IL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/he-IL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/he-IL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/it-IT.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/it-IT.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/it-IT.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/it-IT.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ja-JP.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ja-JP.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ja-JP.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ja-JP.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ko-KR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ko-KR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ko-KR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ko-KR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/nb-NO.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/nb-NO.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/nb-NO.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/nb-NO.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/nl-NL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/nl-NL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/nl-NL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/nl-NL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/pl-PL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/pl-PL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/pl-PL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/pl-PL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/pt-BR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/pt-BR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/pt-BR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/pt-BR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ru-RU.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ru-RU.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ru-RU.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ru-RU.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/sv-SE.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/sv-SE.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/sv-SE.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/sv-SE.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/zh-CN.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/zh-CN.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/zh-CN.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/zh-CN.user.xml
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 51511196de..043d72634f 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -4,6 +4,10 @@
netcoreapp3.1
Umbraco.Web.UI.NetCore
+
+
+ bin\Release\Umbraco.Web.UI.NetCore.xml
+
@@ -13,115 +17,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- tinyMceConfig.config
- Designer
-
-
- umbracoSettings.config
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- PreserveNewest
-
-
- Designer
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
- serilog.config
-
-
- Designer
- serilog.user.config
-
-
-
-
-
- Designer
-
-
- Designer
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.UI.NetCore/Areas/UmbracoBackOffice/Views/BackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
similarity index 98%
rename from src/Umbraco.Web.UI.NetCore/Areas/UmbracoBackOffice/Views/BackOffice/Default.cshtml
rename to src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
index 5bf833dedd..3c17e89485 100644
--- a/src/Umbraco.Web.UI.NetCore/Areas/UmbracoBackOffice/Views/BackOffice/Default.cshtml
+++ b/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
diff --git a/src/Umbraco.Web.UI.NetCore/Areas/UmbracoInstall/Views/Install/Index.cshtml b/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoInstall/Index.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI.NetCore/Areas/UmbracoInstall/Views/Install/Index.cshtml
rename to src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoInstall/Index.cshtml
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 952e8e002f..8d47a7b019 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -143,24 +143,6 @@
True
Settings.settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
index d2ef3b58f6..e7d6bdcfac 100644
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -5,6 +5,10 @@
Library
+
+ bin\Release\Umbraco.Web.Website.xml
+
+