From 50f6b230a9c1b49be4be7ae4c67655413de6b7ba Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Wed, 18 Aug 2021 11:23:19 +0200 Subject: [PATCH] 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