From e734b6dda440a80acf55170811c5fba1b2d84d1e Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 10:40:13 +0200 Subject: [PATCH 01/12] Renaming folder, project, solutions + changing .gitignore (there were old references to Umbraco.Web.UI) --- .gitignore | 2 -- .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Startup.cs | 0 .../Umbraco.Web.UI.csproj} | 0 .../Views/Partials/blocklist/default.cshtml | 0 .../Views/Partials/grid/bootstrap3-fluid.cshtml | 0 .../Views/Partials/grid/bootstrap3.cshtml | 0 .../Views/Partials/grid/editors/base.cshtml | 0 .../Views/Partials/grid/editors/embed.cshtml | 0 .../Views/Partials/grid/editors/macro.cshtml | 0 .../Views/Partials/grid/editors/media.cshtml | 0 .../Views/Partials/grid/editors/rte.cshtml | 0 .../Views/Partials/grid/editors/textstring.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../appsettings.Development.template.json | 0 .../appsettings.template.json | 0 .../PartialViewMacros/Templates/Breadcrumb.cshtml | 0 .../PartialViewMacros/Templates/EditProfile.cshtml | 0 .../PartialViewMacros/Templates/Empty.cshtml | 0 .../PartialViewMacros/Templates/Gallery.cshtml | 0 .../Templates/ListAncestorsFromCurrentPage.cshtml | 0 .../ListChildPagesFromChangeableSource.cshtml | 0 .../Templates/ListChildPagesFromCurrentPage.cshtml | 0 .../Templates/ListChildPagesOrderedByDate.cshtml | 0 .../Templates/ListChildPagesOrderedByName.cshtml | 0 .../ListChildPagesOrderedByProperty.cshtml | 0 .../Templates/ListChildPagesWithDoctype.cshtml | 0 .../Templates/ListDescendantsFromCurrentPage.cshtml | 0 .../Templates/ListImagesFromMediaFolder.cshtml | 0 .../PartialViewMacros/Templates/Login.cshtml | 0 .../PartialViewMacros/Templates/LoginStatus.cshtml | 0 .../Templates/MultinodeTree-picker.cshtml | 0 .../PartialViewMacros/Templates/Navigation.cshtml | 0 .../Templates/RegisterMember.cshtml | 0 .../PartialViewMacros/Templates/SiteMap.cshtml | 0 .../UmbracoBackOffice/AuthorizeUpgrade.cshtml | 0 .../umbraco/UmbracoBackOffice/Default.cshtml | 0 .../umbraco/UmbracoBackOffice/Preview.cshtml | 0 .../umbraco/UmbracoInstall/Index.cshtml | 0 .../umbraco/UmbracoWebsite/NoNodes.cshtml | 0 .../umbraco/config/lang/cs.xml | 0 .../umbraco/config/lang/da.xml | 0 .../umbraco/config/lang/de.xml | 0 .../umbraco/config/lang/en.xml | 0 .../umbraco/config/lang/en_us.xml | 0 .../umbraco/config/lang/es.xml | 0 .../umbraco/config/lang/fr.xml | 0 .../umbraco/config/lang/he.xml | 0 .../umbraco/config/lang/it.xml | 0 .../umbraco/config/lang/ja.xml | 0 .../umbraco/config/lang/ko.xml | 0 .../umbraco/config/lang/nb.xml | 0 .../umbraco/config/lang/nl.xml | 0 .../umbraco/config/lang/pl.xml | 0 .../umbraco/config/lang/pt.xml | 0 .../umbraco/config/lang/ru.xml | 0 .../umbraco/config/lang/sv.xml | 0 .../umbraco/config/lang/tr.xml | 0 .../umbraco/config/lang/zh.xml | 0 .../umbraco/config/lang/zh_tw.xml | 0 .../wwwroot/favicon.ico | Bin src/umbraco-netcore-only.sln | 2 +- src/umbraco.sln | 2 +- 64 files changed, 2 insertions(+), 4 deletions(-) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Program.cs (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Properties/launchSettings.json (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Startup.cs (100%) rename src/{Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj => Umbraco.Web.UI/Umbraco.Web.UI.csproj} (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/blocklist/default.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/bootstrap3-fluid.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/bootstrap3.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/base.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/embed.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/macro.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/media.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/rte.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/Partials/grid/editors/textstring.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/Views/_ViewImports.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/appsettings.Development.template.json (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/appsettings.template.json (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/EditProfile.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/Empty.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/Gallery.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/Login.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/LoginStatus.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/Navigation.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/RegisterMember.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/PartialViewMacros/Templates/SiteMap.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/UmbracoBackOffice/Default.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/UmbracoBackOffice/Preview.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/UmbracoInstall/Index.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/UmbracoWebsite/NoNodes.cshtml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/cs.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/da.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/de.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/en.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/en_us.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/es.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/fr.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/he.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/it.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/ja.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/ko.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/nb.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/nl.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/pl.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/pt.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/ru.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/sv.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/tr.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/zh.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/umbraco/config/lang/zh_tw.xml (100%) rename src/{Umbraco.Web.UI.NetCore => Umbraco.Web.UI}/wwwroot/favicon.ico (100%) 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 From 490c09b81e8346333d9805a4360ab18084a18fbd Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 10:58:23 +0200 Subject: [PATCH 02/12] Remove old references of Umbraco.Web.UI --- .gitignore | 51 +----------------------------------------- build/build.ps1 | 10 --------- src/ApiDocs/docfx.json | 1 - 3 files changed, 1 insertion(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 57bb8c3acc..360fe85ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -52,84 +52,38 @@ App_Data/TEMP/* [Uu]mbraco/[Pp]resentation/[Ff]onts/* [Uu]mbraco/[Pp]resentation/[Cc]ss/* -src/Umbraco.Web.UI/[Cc]ss/* -src/Umbraco.Web.UI/App_Code/* -src/Umbraco.Web.UI/App_Data/* -src/Umbraco.Web.UI/data/* src/Umbraco.Tests/App_Data/* -src/Umbraco.Web.UI/[Mm]edia/* -src/Umbraco.Web.UI/[Mm]aster[Pp]ages/* -src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/* -!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig -src/Umbraco.Web.UI/[Xx]slt/* -src/Umbraco.Web.UI/[Ii]mages/* -src/Umbraco.Web.UI/[Ss]cripts/* -src/Umbraco.Web.UI/Web.*.config.transformed umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx src/Umbraco.Tests/config/applications.config src/Umbraco.Tests/config/trees.config -src/Umbraco.Web.UI/web.config -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/*.vbhtml src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config src/packages/ src/packages/repositories.config -src/Umbraco.Web.UI/[Ww]eb.config *.transformed node_modules lib-bower -src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/* -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.* -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/navigation.controller.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.controller.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/utilities.js -src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/installer.app.js - -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/ -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css -src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html -src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/* src/Umbraco.Web.UI.Client/[Bb]uild/* src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/ -src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/ src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css src/Umbraco.Web.UI.Client/vwd.webinfo -src/Umbraco.Web.UI/App_Plugins/* src/*.psess src/*.vspx NDependOut/* QueryResult.htm -src/Umbraco.Web.UI/[Cc]onfig/appSettings.config -src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config -src/Umbraco.Web.UI/[Uu]mbraco/plugins/* build/ApiDocs/* build/ApiDocs/Output/* src/Umbraco.Web.UI.Client/bower_components/* -/src/Umbraco.Web.UI/[Uu]mbraco/preview -/src/Umbraco.Web.UI/[Uu]mbraco/preview.old # ignore rule for clearing out Belle (avoid rebuilding all the time) preserve.belle @@ -141,7 +95,6 @@ src/*.boltdata/ src/umbraco.sln.ide/* src/.vs/ -src/Umbraco.Web.UI/[Jj]s/* src/Umbraco.Tests/[Mm]edia tools/docfx/* apidocs/_site/* @@ -168,7 +121,6 @@ cypress.env.json /src/Umbraco.Tests.AcceptanceTest/package-lock.json /src/Umbraco.Tests.AcceptanceTest/cypress/videos/ /src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/ -src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb # eof @@ -191,6 +143,7 @@ src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Ll]ogs /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Dd]ata/* /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Mm]odels/* +/src/Umbraco.Web.UI/[Vv]iews/*.vbhtml /src/Umbraco.Web.UI.NetCore/appsettings.json /src/Umbraco.Web.UI.NetCore/appsettings.Development.json @@ -203,8 +156,6 @@ src/Umbraco.Tests.Integration/Views/ src/Umbraco.Tests/TEMP/ -/src/Umbraco.Web.UI/config/umbracoSettings.config - src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ /src/Umbraco.Web.UI.NetCore/appsettings.Local.json src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ diff --git a/build/build.ps1 b/build/build.ps1 index a5f8b6a3e4..9ab602c4ed 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -296,9 +296,6 @@ $buildConfiguration = "Release" - # restore web.config - #$this.TempRestoreFile("$src\Umbraco.Web.UI\web.config") - # cleanup build Write-Host "Clean build" $this.RemoveFile("$tmp\bin\*.dll.config") @@ -319,9 +316,6 @@ Write-Host "Copy xml documentation" Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin" - # 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. Write-Host "Offset dlls timestamps" @@ -366,10 +360,6 @@ $ubuild.DefineMethod("PrepareBuild", { - # $this.TempStoreFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config") - # Write-Host "Create clean web.config" - # $this.CopyFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.Template.config", "$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config") - Write-host "Set environment" $env:UMBRACO_VERSION=$this.Version.Semver.ToString() $env:UMBRACO_RELEASE=$this.Version.Release diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json index 2e9d9c0836..4ca9e92c6a 100644 --- a/src/ApiDocs/docfx.json +++ b/src/ApiDocs/docfx.json @@ -13,7 +13,6 @@ "**/bin/**", "**/Umbraco.Web.csproj", "**/Umbraco.Infrastructure.csproj", - "**/Umbraco.Web.UI.csproj", "**/Umbraco.Web.UI.Netcore.csproj", "**/**.Test**/*.csproj" ] From 7e77454f0364ddb548e230fe93ae93d990466af2 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:07:06 +0200 Subject: [PATCH 03/12] Changing to the correct project ref in .gitignore and .vscode/ --- .gitignore | 36 ++++++++++++++++++------------------ .vscode/launch.json | 6 +++--- .vscode/tasks.json | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 360fe85ee7..936bf7a5ad 100644 --- a/.gitignore +++ b/.gitignore @@ -127,25 +127,26 @@ cypress.env.json /src/Umbraco.Web.UI.Client/TESTS-*.xml /src/ApiDocs/api/* /src/Umbraco.Web.UI.Client/package-lock.json -/src/Umbraco.Web.UI.NetCore/wwwroot/Media/* -/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/* +/src/Umbraco.Web.UI/wwwroot/Media/* +/src/Umbraco.Web.UI/wwwroot/is-cache/* /src/Umbraco.Tests.Integration/App_Data/* /src/Umbraco.Tests.Integration/TEMP/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/assets/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/js/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/lib/* -/src/Umbraco.Web.UI.NetCore/wwwroot/[Uu]mbraco/views/* -/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/* -/src/Umbraco.Web.UI.NetCore/App_Data/Logs/* -/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/* -/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/* -/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/* -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Ll]ogs -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Dd]ata/* -/src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Mm]odels/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/* +/src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/* +/src/Umbraco.Web.UI/wwwroot/App_Data/TEMP/* +/src/Umbraco.Web.UI/App_Data/Logs/* +/src/Umbraco.Web.UI/App_Data/TEMP/TypesCache/* +/src/Umbraco.Web.UI/App_Data/TEMP/* +/src/Umbraco.Web.UI/App_Data/Smidge/Cache/* +/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs +/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/* +/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/* /src/Umbraco.Web.UI/[Vv]iews/*.vbhtml -/src/Umbraco.Web.UI.NetCore/appsettings.json -/src/Umbraco.Web.UI.NetCore/appsettings.Development.json +/src/Umbraco.Web.UI/appsettings.json +/src/Umbraco.Web.UI/appsettings.Development.json +/src/Umbraco.Web.UI/appsettings.Local.json src/Umbraco.Tests.Integration/umbraco/Data/ @@ -157,8 +158,7 @@ src/Umbraco.Tests/TEMP/ src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/ -/src/Umbraco.Web.UI.NetCore/appsettings.Local.json src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/ src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf -src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json +src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 85b28c51c1..1c7f8b11d7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "Dotnet build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/bin/Debug/net5.0/Umbraco.Web.UI.NetCore.dll", + "program": "${workspaceFolder}/src/Umbraco.Web.UI/bin/Debug/net5.0/Umbraco.Web.UI.dll", "args": [], - "cwd": "${workspaceFolder}/src/Umbraco.Web.UI.NetCore", + "cwd": "${workspaceFolder}/src/Umbraco.Web.UI", "stopAtEntry": false, // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser "serverReadyAction": { @@ -33,4 +33,4 @@ "processId": "${command:pickProcess}" } ] -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e2b6c01894..a086d1fb3a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -57,11 +57,11 @@ "args": [ "watch", "run", - "${workspaceFolder}/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj", + "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} From 5f4ddf86ab9df81e45ae51d78509ed96fd50964e Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:13:58 +0200 Subject: [PATCH 04/12] Renaming proj ref in build script and azure pipelines file --- build/azure-pipelines.yml | 8 ++++---- build/build.ps1 | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index f4ee42deeb..5dc9df3f3b 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -192,7 +192,7 @@ stages: # displayName: dotnet build (Netcore) # inputs: # command: build -# projects: '**/Umbraco.Web.UI.Netcore.csproj' +# projects: '**/Umbraco.Web.UI.csproj' - task: NodeTool@0 displayName: Use Node 11.x inputs: @@ -208,9 +208,9 @@ stages: gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js targets: build workingDirectory: src\Umbraco.Web.UI.Client - - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI.Netcore\Umbraco.Web.UI.Netcore.csproj" + - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" displayName: dotnet run (Netcore) -# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj +# - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj # displayName: dotnet run (Netcore) - task: PowerShell@1 displayName: Generate Cypress.env.json @@ -305,7 +305,7 @@ stages: displayName: dotnet run (Netcore) inputs: targetType: 'inline' - script: 'nohup dotnet run -p ./src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj &' + script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &' - task: Bash@3 displayName: Generate Cypress.env.json inputs: diff --git a/build/build.ps1 b/build/build.ps1 index 9ab602c4ed..ea0a50e5b1 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -53,7 +53,7 @@ $port = "" + $semver.Major + $semver.Minor + ("" + $semver.Patch).PadLeft(2, '0') Write-Host "Update port in launchSettings.json to $port" - $filePath = "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Properties\launchSettings.json" + $filePath = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Properties\launchSettings.json" $this.ReplaceFileText($filePath, ` "http://localhost:(\d+)?", ` "http://localhost:$port") @@ -178,13 +178,13 @@ Write-Host "Compile Umbraco" Write-Host "Logging to $log" - & dotnet build "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" ` + & dotnet build "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" ` --configuration $buildConfiguration ` --output "$($this.BuildTemp)\bin\\" ` > $log # get files into WebApp\bin - & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" ` + & dotnet publish "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" ` --configuration Release --output "$($this.BuildTemp)\WebApp\bin\\" ` > $log @@ -200,13 +200,13 @@ $this.RemoveFile($excludeFiles) # copy rest of the files into WebApp - $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco") + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco") $excludeUmbracoDirs = @("$($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" + $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Views", "*", "$($this.BuildTemp)\WebApp\Views") + Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI\appsettings.json" "$($this.BuildTemp)\WebApp" - if (-not $?) { throw "Failed to compile Umbraco.Web.UI.NetCore." } + if (-not $?) { throw "Failed to compile Umbraco.Web.UI." } # /p:UmbracoBuild tells the csproj that we are building from PS, not VS }) @@ -338,10 +338,10 @@ # copy Belle Write-Host "Copy Belle" - $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") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib") + $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views") @@ -350,9 +350,9 @@ $this.CopyFiles("$templates", "*", "$tmp\Templates") Write-Host "Copy files for dotnet templates" - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Program.cs", "$tmp\Templates\UmbracoProject") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Startup.cs", "$tmp\Templates\UmbracoProject") - $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\Views", "*", "$tmp\Templates\UmbracoProject\Views") + $this.CopyFiles("$src\Umbraco.Web.UI", "Program.cs", "$tmp\Templates\UmbracoProject") + $this.CopyFiles("$src\Umbraco.Web.UI", "Startup.cs", "$tmp\Templates\UmbracoProject") + $this.CopyFiles("$src\Umbraco.Web.UI\Views", "*", "$tmp\Templates\UmbracoProject\Views") $this.RemoveDirectory("$tmp\Templates\UmbracoProject\bin") }) @@ -443,7 +443,7 @@ { $this.VerifyNuGetConsistency( ("UmbracoCms"), - ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI.NetCore", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe")) + ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe")) if ($this.OnError()) { return } }) From 63e12c8dabdcab0c233d2aa250e445245f44bcf2 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:18:30 +0200 Subject: [PATCH 05/12] Changing project ref in dotnet new templates related files --- build/templates/UmbracoProject/.template.config/template.json | 2 +- build/templates/UmbracoProject/Properties/launchSettings.json | 2 +- build/templates/UmbracoProject/UmbracoProject.csproj | 2 +- build/templates/UmbracoProject/Views/_ViewImports.cshtml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/templates/UmbracoProject/.template.config/template.json b/build/templates/UmbracoProject/.template.config/template.json index 3b34f77130..9fa69b6df4 100644 --- a/build/templates/UmbracoProject/.template.config/template.json +++ b/build/templates/UmbracoProject/.template.config/template.json @@ -35,7 +35,7 @@ "type": "generated", "generator": "regex", "dataType": "string", - "replaces": "Umbraco.Cms.Web.UI.NetCore", + "replaces": "Umbraco.Cms.Web.UI", "parameters": { "source": "name", "steps": [ diff --git a/build/templates/UmbracoProject/Properties/launchSettings.json b/build/templates/UmbracoProject/Properties/launchSettings.json index f40916f4d1..97fdc9f7f5 100644 --- a/build/templates/UmbracoProject/Properties/launchSettings.json +++ b/build/templates/UmbracoProject/Properties/launchSettings.json @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Umbraco.Web.UI.NetCore": { + "Umbraco.Web.UI": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, diff --git a/build/templates/UmbracoProject/UmbracoProject.csproj b/build/templates/UmbracoProject/UmbracoProject.csproj index 2310f789e2..5ed4d927ef 100644 --- a/build/templates/UmbracoProject/UmbracoProject.csproj +++ b/build/templates/UmbracoProject/UmbracoProject.csproj @@ -1,7 +1,7 @@  net5.0 - Umbraco.Cms.Web.UI.NetCore + Umbraco.Cms.Web.UI diff --git a/build/templates/UmbracoProject/Views/_ViewImports.cshtml b/build/templates/UmbracoProject/Views/_ViewImports.cshtml index ec320f2af5..cb9a0b658e 100644 --- a/build/templates/UmbracoProject/Views/_ViewImports.cshtml +++ b/build/templates/UmbracoProject/Views/_ViewImports.cshtml @@ -1,8 +1,8 @@ -@using Umbraco.Web.UI.NetCore +@using Umbraco.Web.UI @using Umbraco.Extensions @using Umbraco.Web.PublishedModels @using Umbraco.Cms.Core.Models.PublishedContent @using Microsoft.AspNetCore.Html @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Smidge -@inject Smidge.SmidgeHelper SmidgeHelper \ No newline at end of file +@inject Smidge.SmidgeHelper SmidgeHelper From 50f6b230a9c1b49be4be7ae4c67655413de6b7ba Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:23:19 +0200 Subject: [PATCH 06/12] Further renaming --- src/ApiDocs/docfx.json | 2 +- src/JsonSchema/Program.cs | 4 ++-- .../DependencyInjection/UmbracoBuilderExtensions.cs | 2 +- .../Umbraco.Web.Common/FileNameTests.cs | 2 +- src/Umbraco.Web.UI/Program.cs | 2 +- src/Umbraco.Web.UI/Properties/launchSettings.json | 2 +- src/Umbraco.Web.UI/Startup.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 +++--- src/Umbraco.Web.UI/Views/_ViewImports.cshtml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ApiDocs/docfx.json b/src/ApiDocs/docfx.json index 4ca9e92c6a..e5f6dd7410 100644 --- a/src/ApiDocs/docfx.json +++ b/src/ApiDocs/docfx.json @@ -13,7 +13,7 @@ "**/bin/**", "**/Umbraco.Web.csproj", "**/Umbraco.Infrastructure.csproj", - "**/Umbraco.Web.UI.Netcore.csproj", + "**/Umbraco.Web.UI.csproj", "**/**.Test**/*.csproj" ] } diff --git a/src/JsonSchema/Program.cs b/src/JsonSchema/Program.cs index d8b31ad224..cd09093020 100644 --- a/src/JsonSchema/Program.cs +++ b/src/JsonSchema/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Threading.Tasks; using CommandLine; @@ -9,7 +9,7 @@ namespace JsonSchema { private class Options { - [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json")] + [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/umbraco/config/appsettings-schema.json")] public string OutputFile { get; set; } } diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index bb0da4d08a..ba0ca95fe0 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -85,7 +85,7 @@ namespace Umbraco.Cms.Tests.Integration.DependencyInjection currFolder = currFolder.Parent; } - DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI.NetCore", SearchOption.TopDirectoryOnly).First(); + DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); return new LocalizedTextServiceFileSources( diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs index 4d7d0a0f26..0575813811 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs @@ -31,7 +31,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common private IEnumerable GetUiFiles(IEnumerable pathFromNetCore) { var sourceRoot = TestContext.CurrentContext.TestDirectory.Split("Umbraco.Tests.UnitTests")[0]; - var pathToFiles = Path.Combine(sourceRoot, "Umbraco.Web.UI.NetCore"); + var pathToFiles = Path.Combine(sourceRoot, "Umbraco.Web.UI"); foreach (var pathSection in pathFromNetCore) { pathToFiles = Path.Combine(pathToFiles, pathSection); diff --git a/src/Umbraco.Web.UI/Program.cs b/src/Umbraco.Web.UI/Program.cs index 7a6ee4dcfd..797fd00562 100644 --- a/src/Umbraco.Web.UI/Program.cs +++ b/src/Umbraco.Web.UI/Program.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Umbraco.Cms.Web.UI.NetCore +namespace Umbraco.Cms.Web.UI { public class Program { diff --git a/src/Umbraco.Web.UI/Properties/launchSettings.json b/src/Umbraco.Web.UI/Properties/launchSettings.json index f4dda49a54..0f5957beb0 100644 --- a/src/Umbraco.Web.UI/Properties/launchSettings.json +++ b/src/Umbraco.Web.UI/Properties/launchSettings.json @@ -16,7 +16,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "Umbraco.Web.UI.NetCore": { + "Umbraco.Web.UI": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/src/Umbraco.Web.UI/Startup.cs b/src/Umbraco.Web.UI/Startup.cs index 73eeef864f..0d263c7b6b 100644 --- a/src/Umbraco.Web.UI/Startup.cs +++ b/src/Umbraco.Web.UI/Startup.cs @@ -7,7 +7,7 @@ using Microsoft.Extensions.Hosting; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -namespace Umbraco.Cms.Web.UI.NetCore +namespace Umbraco.Cms.Web.UI { public class Startup { diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 7979338f47..40fe7fe46a 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2,10 +2,10 @@ net5.0 - Umbraco.Cms.Web.UI.NetCore + Umbraco.Cms.Web.UI - bin/Release/Umbraco.Web.UI.NetCore.xml + bin/Release/Umbraco.Web.UI.xml true @@ -111,7 +111,7 @@ - + diff --git a/src/Umbraco.Web.UI/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml index 703e248a8f..2d6f535107 100644 --- a/src/Umbraco.Web.UI/Views/_ViewImports.cshtml +++ b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml @@ -1,5 +1,5 @@ @using Umbraco.Extensions -@using Umbraco.Cms.Web.UI.NetCore +@using Umbraco.Cms.Web.UI @using Umbraco.Cms.Web.Common.PublishedModels @using Umbraco.Cms.Web.Common.Views @using Umbraco.Cms.Core.Models.PublishedContent From 460df9bfd231ae3ddd3a5d125af0e86e0552fff2 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:26:27 +0200 Subject: [PATCH 07/12] Changing gulp config and karma.conf.js --- src/Umbraco.Web.UI.Client/gulp/config.js | 2 +- src/Umbraco.Web.UI.Client/test/config/karma.conf.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js index 5991b53f7f..3ff4cf366b 100755 --- a/src/Umbraco.Web.UI.Client/gulp/config.js +++ b/src/Umbraco.Web.UI.Client/gulp/config.js @@ -81,7 +81,7 @@ module.exports = { assets: "./src/assets/**" } }, - roots: ["../Umbraco.Web.UI.NetCore/wwwroot/"], + roots: ["../Umbraco.Web.UI/wwwroot/"], targets: { js: "umbraco/js/", lib: "umbraco/lib/", diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index b96ab87104..403305630a 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -34,12 +34,12 @@ module.exports = function (config) { 'test/config/app.unit.js', //application files - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.controllers.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.directives.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.filters.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.services.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.interceptors.min.js', - '../Umbraco.Web.UI.NetCore/wwwroot/umbraco/js/*.resources.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.controllers.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.directives.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.filters.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.services.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.interceptors.min.js', + '../Umbraco.Web.UI/wwwroot/umbraco/js/*.resources.min.js', //mocked data and routing 'src/common/mocks/umbraco.servervariables.js', From f3115a8b0528c5db84d5ba15daf6575fe0821b09 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:50:48 +0200 Subject: [PATCH 08/12] More renaming --- .vscode/tasks.json | 2 +- build/azure-pipelines.yml | 8 ++++---- .../DependencyInjection/UmbracoBuilderExtensions.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a086d1fb3a..9d2a5248e8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,7 +50,7 @@ }, { "label": "Dotnet watch", - "detail": "Dotnet run and watch of Web.UI.NetCore", + "detail": "Dotnet run and watch of Web.UI", "promptOnClose": true, "command": "dotnet", "type": "process", diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 5dc9df3f3b..c9e29d84b1 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -189,7 +189,7 @@ stages: - powershell: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer displayName: Create database # - task: DotNetCoreCLI@2 -# displayName: dotnet build (Netcore) +# displayName: dotnet build # inputs: # command: build # projects: '**/Umbraco.Web.UI.csproj' @@ -209,9 +209,9 @@ stages: targets: build workingDirectory: src\Umbraco.Web.UI.Client - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" - displayName: dotnet run (Netcore) + displayName: dotnet run # - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj -# displayName: dotnet run (Netcore) +# displayName: dotnet run - task: PowerShell@1 displayName: Generate Cypress.env.json inputs: @@ -302,7 +302,7 @@ stages: targets: build workingDirectory: src/Umbraco.Web.UI.Client - task: Bash@3 - displayName: dotnet run (Netcore) + displayName: dotnet run inputs: targetType: 'inline' script: 'nohup dotnet run -p ./src/Umbraco.Web.UI/Umbraco.Web.UI.csproj &' diff --git a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index ba0ca95fe0..1d7142d270 100644 --- a/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -85,8 +85,8 @@ namespace Umbraco.Cms.Tests.Integration.DependencyInjection currFolder = currFolder.Parent; } - DirectoryInfo netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); - var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); + DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); + var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); return new LocalizedTextServiceFileSources( loggerFactory.CreateLogger(), From d9d7de8467df35f97947d930937e483193c75a75 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 12:47:52 +0200 Subject: [PATCH 09/12] Moving up the "Umbraco.Web.UI" proj reference, so that it is the first project from solution file (.sln) since it will be selected as startup one by default. --- src/umbraco-netcore-only.sln | 4 ++-- src/umbraco.sln | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/umbraco-netcore-only.sln b/src/umbraco-netcore-only.sln index f387c5bf0a..375c23208a 100644 --- a/src/umbraco-netcore-only.sln +++ b/src/umbraco-netcore-only.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29209.152 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject ..\linting\.editorconfig = ..\linting\.editorconfig @@ -128,8 +130,6 @@ 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", "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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Common", "Umbraco.Tests.Common\Umbraco.Tests.Common.csproj", "{A499779C-1B3B-48A8-B551-458E582E6E96}" diff --git a/src/umbraco.sln b/src/umbraco.sln index f9ce65b67b..fe2e8a5a44 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29209.152 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{DCDFE97C-5630-4F6F-855D-8AEEB96556A5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject ..\linting\.editorconfig = ..\linting\.editorconfig @@ -136,8 +138,6 @@ 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", "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 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{D6319409-777A-4BD0-93ED-B2DFD805B32C}" From dba385e5e52ee5a0dafd48f687e8d8254b3a633a Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 18 Aug 2021 16:00:57 +0200 Subject: [PATCH 10/12] Added App_Plugins to publish output --- build/templates/UmbracoProject/UmbracoProject.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/templates/UmbracoProject/UmbracoProject.csproj b/build/templates/UmbracoProject/UmbracoProject.csproj index 2310f789e2..cc8314c2fe 100644 --- a/build/templates/UmbracoProject/UmbracoProject.csproj +++ b/build/templates/UmbracoProject/UmbracoProject.csproj @@ -39,6 +39,10 @@ true Always + + true + Always + From 6b18f93ae70616c61dc101b860ae06032c0e4ce8 Mon Sep 17 00:00:00 2001 From: Paul Johnson Date: Thu, 19 Aug 2021 14:11:40 +0100 Subject: [PATCH 11/12] Fix issue where MSDI confused which ctor to use for EmailSender --- src/Umbraco.Infrastructure/EmailSender.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Infrastructure/EmailSender.cs b/src/Umbraco.Infrastructure/EmailSender.cs index 20c48a3b04..612944a28a 100644 --- a/src/Umbraco.Infrastructure/EmailSender.cs +++ b/src/Umbraco.Infrastructure/EmailSender.cs @@ -30,11 +30,15 @@ namespace Umbraco.Cms.Infrastructure ILogger logger, IOptions globalSettings, IEventAggregator eventAggregator) - : this(globalSettings, eventAggregator, null) - => _logger = logger; + : this(logger, globalSettings, eventAggregator, null) { } - public EmailSender(IOptions globalSettings, IEventAggregator eventAggregator, INotificationHandler handler) + public EmailSender( + ILogger logger, + IOptions globalSettings, + IEventAggregator eventAggregator, + INotificationHandler handler) { + _logger = logger; _eventAggregator = eventAggregator; _globalSettings = globalSettings.Value; _notificationHandlerRegistered = handler is not null; From 061f1b3b879f88f327a2fb215aa937811be9cbcf Mon Sep 17 00:00:00 2001 From: Paul Johnson Date: Thu, 19 Aug 2021 14:15:14 +0100 Subject: [PATCH 12/12] Move EmailSender to Mail namespace. --- .../DependencyInjection/UmbracoBuilder.CoreServices.cs | 2 +- src/Umbraco.Infrastructure/{ => Mail}/EmailSender.cs | 2 +- src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) rename src/Umbraco.Infrastructure/{ => Mail}/EmailSender.cs (99%) diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs index d6197a371a..61d96e2e61 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs @@ -40,6 +40,7 @@ using Umbraco.Cms.Infrastructure.Examine; using Umbraco.Cms.Infrastructure.HealthChecks; using Umbraco.Cms.Infrastructure.HostedServices; using Umbraco.Cms.Infrastructure.Install; +using Umbraco.Cms.Infrastructure.Mail; using Umbraco.Cms.Infrastructure.Media; using Umbraco.Cms.Infrastructure.Migrations; using Umbraco.Cms.Infrastructure.Migrations.Install; @@ -52,7 +53,6 @@ using Umbraco.Cms.Infrastructure.Runtime; using Umbraco.Cms.Infrastructure.Search; using Umbraco.Cms.Infrastructure.Serialization; using Umbraco.Extensions; -using System; namespace Umbraco.Cms.Infrastructure.DependencyInjection { diff --git a/src/Umbraco.Infrastructure/EmailSender.cs b/src/Umbraco.Infrastructure/Mail/EmailSender.cs similarity index 99% rename from src/Umbraco.Infrastructure/EmailSender.cs rename to src/Umbraco.Infrastructure/Mail/EmailSender.cs index 612944a28a..4c48a759fe 100644 --- a/src/Umbraco.Infrastructure/EmailSender.cs +++ b/src/Umbraco.Infrastructure/Mail/EmailSender.cs @@ -13,7 +13,7 @@ using Umbraco.Cms.Core.Notifications; using Umbraco.Cms.Infrastructure.Extensions; using SmtpClient = MailKit.Net.Smtp.SmtpClient; -namespace Umbraco.Cms.Infrastructure +namespace Umbraco.Cms.Infrastructure.Mail { /// /// A utility class for sending emails diff --git a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs index 48e83b9dcf..3a8949cff3 100644 --- a/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs +++ b/src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs @@ -8,10 +8,8 @@ using System.ComponentModel; using System.IO; using System.Linq; using System.Reflection; -using Castle.Core.Logging; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Moq; @@ -36,13 +34,12 @@ using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Runtime; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Strings; -using Umbraco.Cms.Infrastructure; +using Umbraco.Cms.Infrastructure.Mail; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Infrastructure.Persistence.Mappers; using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax; using Umbraco.Cms.Tests.Common; using Umbraco.Cms.Tests.Common.Testing; -using Umbraco.Cms.Web.Common.AspNetCore; using Umbraco.Extensions; using Constants = Umbraco.Cms.Core.Constants; using File = System.IO.File;