From 7f58b3479bb262d6772f7f092bcbbc4f69046d16 Mon Sep 17 00:00:00 2001 From: Mole Date: Mon, 15 Feb 2021 13:07:12 +0100 Subject: [PATCH] Align namespaces in WebAssets to Umbraco.Cms.Infrastructure --- .../WebAssets/BackOfficeJavaScriptInitializer.cs | 3 +-- src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs | 4 +--- .../WebAssets/PropertyEditorAssetAttribute.cs | 2 +- src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs | 5 +---- .../WebAssets/RuntimeMinifierExtensions.cs | 3 ++- .../WebAssets/ServerVariablesParser.cs | 2 +- .../WebAssets/ServerVariablesParsing.cs | 2 +- src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs | 2 +- src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs | 2 +- .../DependencyInjection/UmbracoBuilderExtensions.cs | 3 ++- .../ModelsBuilderNotificationHandler.cs | 3 ++- .../AngularIntegration/JsInitializationTests.cs | 3 ++- .../AngularIntegration/ServerVariablesParserTests.cs | 3 ++- .../Controllers/BackOfficeController.cs | 2 +- src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs | 2 +- .../DependencyInjection/UmbracoBuilderExtensions.cs | 3 ++- .../Extensions/HtmlHelperBackOfficeExtensions.cs | 2 +- .../umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml | 2 +- .../umbraco/UmbracoBackOffice/Default.cshtml | 2 +- .../umbraco/UmbracoBackOffice/Preview.cshtml | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs index fac39217f3..7296e08ab1 100644 --- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs +++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeJavaScriptInitializer.cs @@ -4,7 +4,7 @@ using System.Text.RegularExpressions; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { /// /// Creates a JavaScript block to initialize the back office @@ -42,7 +42,6 @@ namespace Umbraco.Web.WebAssets jarray.Append("\""); jarray.Append(file); jarray.Append("\""); - } jarray.Append("]"); diff --git a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs index 040810998b..6fffc5a693 100644 --- a/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs +++ b/src/Umbraco.Infrastructure/WebAssets/BackOfficeWebAssets.cs @@ -4,8 +4,6 @@ using System.Linq; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Manifest; @@ -13,7 +11,7 @@ using Umbraco.Cms.Core.PropertyEditors; using Umbraco.Cms.Core.WebAssets; using Umbraco.Extensions; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { public class BackOfficeWebAssets { diff --git a/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs index 14d93f1d87..06913d4204 100644 --- a/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs +++ b/src/Umbraco.Infrastructure/WebAssets/PropertyEditorAssetAttribute.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Cms.Core.WebAssets; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { /// /// Indicates that the property editor requires this asset be loaded when the back office is loaded diff --git a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs index 5e29355948..df35c0e8a1 100644 --- a/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs +++ b/src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs @@ -8,11 +8,8 @@ // //------------------------------------------------------------------------------ -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { - using System; - - /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs index 37a323b4e6..f37dd0bb8c 100644 --- a/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs +++ b/src/Umbraco.Infrastructure/WebAssets/RuntimeMinifierExtensions.cs @@ -4,8 +4,9 @@ using System.Threading.Tasks; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Extensions { public static class RuntimeMinifierExtensions { diff --git a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs index 2a6a690538..c5f4eb128d 100644 --- a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs +++ b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParser.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using Umbraco.Cms.Core.Events; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { /// /// Ensures the server variables are included in the outgoing JS script diff --git a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParsing.cs b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParsing.cs index 4dd7a0a573..ffa8713add 100644 --- a/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParsing.cs +++ b/src/Umbraco.Infrastructure/WebAssets/ServerVariablesParsing.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Cms.Core.Events; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { /// /// A notification for when server variables are parsing diff --git a/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs index 15aefbfbcd..2eba85a3c3 100644 --- a/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs +++ b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComponent.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Core.Composing; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { public sealed class WebAssetsComponent : IComponent { diff --git a/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs index 15d3388017..1298340a73 100644 --- a/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs +++ b/src/Umbraco.Infrastructure/WebAssets/WebAssetsComposer.cs @@ -2,7 +2,7 @@ using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Extensions; -namespace Umbraco.Web.WebAssets +namespace Umbraco.Cms.Infrastructure.WebAssets { public sealed class WebAssetsComposer : ComponentComposer { diff --git a/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs index 5209683e8e..542efe084a 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs @@ -7,10 +7,11 @@ using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Events; using Umbraco.Cms.Core.Models.PublishedContent; +using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.ModelsBuilder.Embedded; using Umbraco.Cms.ModelsBuilder.Embedded.Building; using Umbraco.Cms.Web.Common.ModelBinders; -using Umbraco.Web.WebAssets; /* * OVERVIEW: diff --git a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs index 2dc2610742..5b6c416b0f 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs @@ -10,11 +10,12 @@ using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Strings; +using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Infrastructure.Services.Implement; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.ModelsBuilder.Embedded.BackOffice; using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; namespace Umbraco.Cms.ModelsBuilder.Embedded { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs index 21943d1144..29833c064d 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs @@ -2,8 +2,9 @@ // See LICENSE for more details. using NUnit.Framework; +using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs index 18d1aae0c2..e4bb0e4d27 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs @@ -6,8 +6,9 @@ using System.Threading.Tasks; using Moq; using NUnit.Framework; using Umbraco.Cms.Core.Events; +using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration { diff --git a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs index fe5785b219..115c782af7 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs @@ -22,6 +22,7 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Security; @@ -31,7 +32,6 @@ using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Cms.Web.Common.Controllers; using Umbraco.Cms.Web.Common.Filters; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs index 749b2a0bfb..ac03a988a5 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs @@ -15,12 +15,12 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Web; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.Web.BackOffice.ActionResults; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Cms.Web.Common.Filters; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs index ac051b21c8..6598437819 100644 --- a/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs @@ -8,7 +8,9 @@ using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Services; +using Umbraco.Cms.Core.WebAssets; using Umbraco.Cms.Infrastructure.DependencyInjection; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.BackOffice.Middleware; @@ -17,7 +19,6 @@ using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Cms.Web.BackOffice.Services; using Umbraco.Cms.Web.BackOffice.Trees; using Umbraco.Cms.Web.Common.Authorization; -using Umbraco.Web.WebAssets; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs index 934442ea46..a632e7d02a 100644 --- a/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs @@ -7,10 +7,10 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Newtonsoft.Json; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.WebAssets; +using Umbraco.Cms.Infrastructure.WebAssets; using Umbraco.Cms.Web.BackOffice.Controllers; using Umbraco.Cms.Web.BackOffice.Security; using Umbraco.Extensions; -using Umbraco.Web.WebAssets; namespace Umbraco.Extensions { diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml index 922d30654c..c081d81bed 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml @@ -4,9 +4,9 @@ @using Umbraco.Cms.Core.Configuration.Models @using Umbraco.Cms.Core.Hosting @using Umbraco.Cms.Core.WebAssets +@using Umbraco.Cms.Infrastructure.WebAssets @using Umbraco.Cms.Web.BackOffice.Controllers @using Umbraco.Cms.Web.BackOffice.Security -@using Umbraco.Web.WebAssets @using Umbraco.Extensions @inject BackOfficeServerVariables backOfficeServerVariables @inject IUmbracoVersion umbracoVersion diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml index d488e5295c..98408c00d2 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml @@ -7,9 +7,9 @@ @using Umbraco.Cms.Core.Logging @using Umbraco.Cms.Core.Services @using Umbraco.Cms.Core.WebAssets +@using Umbraco.Cms.Infrastructure.WebAssets @using Umbraco.Cms.Web.BackOffice.Controllers @using Umbraco.Cms.Web.BackOffice.Security -@using Umbraco.Web.WebAssets @using Umbraco.Extensions @inject BackOfficeServerVariables backOfficeServerVariables @inject IUmbracoVersion umbracoVersion diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml index d2020a9182..964089f7cb 100644 --- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml +++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Preview.cshtml @@ -5,9 +5,9 @@ @using Umbraco.Cms.Core.Logging @using Umbraco.Cms.Core.Services @using Umbraco.Cms.Core.WebAssets +@using Umbraco.Cms.Infrastructure.WebAssets @using Umbraco.Cms.Web.BackOffice.Controllers @using Umbraco.Cms.Web.BackOffice.Security -@using Umbraco.Web.WebAssets @using Umbraco.Extensions @inject IBackOfficeSignInManager SignInManager @inject BackOfficeServerVariables BackOfficeServerVariables