Align namespaces in WebAssets to Umbraco.Cms.Infrastructure

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
 {
     /// <summary>
     /// 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("]");
 

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
     {

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
 {
     /// <summary>
     /// Indicates that the property editor requires this asset be loaded when the back office is loaded

src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs

@@ -8,11 +8,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Umbraco.Web.WebAssets
+namespace Umbraco.Cms.Infrastructure.WebAssets
 {
-    using System;
-
-
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

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
     {

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
 {
     /// <summary>
     /// Ensures the server variables are included in the outgoing JS script

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
 {
     /// <summary>
     /// A notification for when server variables are parsing

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
     {

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<WebAssetsComponent>
     {

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:

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
 {

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
 {

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
 {

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

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

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
 {

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
 {

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

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

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