diff --git a/.gitignore b/.gitignore index fb5e701d1c..57bb8c3acc 100644 --- a/.gitignore +++ b/.gitignore @@ -76,10 +76,8 @@ src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config src/Umbraco.Web.UI/[Cc]onfig/serilog.config src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config src/Umbraco.Tests/config/404handlers.config -src/Umbraco.Web.UI/[Vv]iews/*.cshtml src/Umbraco.Web.UI/[Vv]iews/*.vbhtml src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config -src/Umbraco.Web.UI/[Vv]iews/* src/packages/ src/packages/repositories.config diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI/Program.cs similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Program.cs rename to src/Umbraco.Web.UI/Program.cs diff --git a/src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json b/src/Umbraco.Web.UI/Properties/launchSettings.json similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Properties/launchSettings.json rename to src/Umbraco.Web.UI/Properties/launchSettings.json diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI/Startup.cs similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Startup.cs rename to src/Umbraco.Web.UI/Startup.cs diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj rename to src/Umbraco.Web.UI/Umbraco.Web.UI.csproj diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml rename to src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3-fluid.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/bootstrap3.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/base.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/base.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/embed.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/macro.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/media.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/media.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/rte.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/rte.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml b/src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml rename to src/Umbraco.Web.UI/Views/Partials/grid/editors/textstring.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/Views/_ViewImports.cshtml rename to src/Umbraco.Web.UI/Views/_ViewImports.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json similarity index 100% rename from src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json rename to src/Umbraco.Web.UI/appsettings.Development.template.json diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.template.json b/src/Umbraco.Web.UI/appsettings.template.json similarity index 100% rename from src/Umbraco.Web.UI.NetCore/appsettings.template.json rename to src/Umbraco.Web.UI/appsettings.template.json diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/EditProfile.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/EditProfile.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/EditProfile.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Empty.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Empty.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Empty.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Gallery.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Gallery.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Login.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Login.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Login.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Navigation.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/Navigation.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/Navigation.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml b/src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/SiteMap.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/PartialViewMacros/Templates/SiteMap.cshtml rename to src/Umbraco.Web.UI/umbraco/PartialViewMacros/Templates/SiteMap.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Default.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoBackOffice/Preview.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoInstall/Index.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoInstall/Index.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoInstall/Index.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/UmbracoWebsite/NoNodes.cshtml rename to src/Umbraco.Web.UI/umbraco/UmbracoWebsite/NoNodes.cshtml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/umbraco/config/lang/cs.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/cs.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/cs.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/da.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/de.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/de.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/en.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/es.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/es.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/fr.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/fr.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/he.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/he.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/it.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/it.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ja.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ja.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ko.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ko.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nb.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nb.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/nb.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/nl.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/nl.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pl.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/pl.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/pt.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/pt.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/ru.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/ru.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/sv.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/sv.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/tr.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/tr.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/zh.xml diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml similarity index 100% rename from src/Umbraco.Web.UI.NetCore/umbraco/config/lang/zh_tw.xml rename to src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml diff --git a/src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico b/src/Umbraco.Web.UI/wwwroot/favicon.ico similarity index 100% rename from src/Umbraco.Web.UI.NetCore/wwwroot/favicon.ico rename to src/Umbraco.Web.UI/wwwroot/favicon.ico diff --git a/src/umbraco-netcore-only.sln b/src/umbraco-netcore-only.sln index aca309326c..f387c5bf0a 100644 --- a/src/umbraco-netcore-only.sln +++ b/src/umbraco-netcore-only.sln @@ -128,7 +128,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.PublishedCache.NuCa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.BackOffice", "Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj", "{9B95EEF7-63FE-4432-8C63-166BE9C1A929}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject diff --git a/src/umbraco.sln b/src/umbraco.sln index 687839d814..f9ce65b67b 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -136,7 +136,7 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.NetCore", "Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Website", "Umbraco.Web.Website\Umbraco.Web.Website.csproj", "{5A246D54-3109-4D2B-BE7D-FC0787D126AE}" EndProject