yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align namespaces in Packaging to Umbraco.Cms.Core

Browse Source 
And fix tests
This commit is contained in:
Mole
2021-02-15 13:44:18 +01:00
parent eb091f8dcd
commit 7e791f3fe7
16 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Infrastructure/Compose/NestedContentPropertyComposer.cs
View File

@@ -1,5 +1,4 @@
using Umbraco.Cms.Core.Composing;
using Umbraco.Core;
namespace Umbraco.Cms.Core.Compose
{

3
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
View File

@@ -15,6 +15,7 @@ using Umbraco.Cms.Core.Mail;
using Umbraco.Cms.Core.Manifest;
using Umbraco.Cms.Core.Media;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
using Umbraco.Cms.Core.PublishedCache;
@@ -39,8 +40,6 @@ using Umbraco.Cms.Infrastructure.Persistence;
using Umbraco.Cms.Infrastructure.Runtime;
using Umbraco.Cms.Infrastructure.Search;
using Umbraco.Cms.Infrastructure.Serialization;
using Umbraco.Core;
using Umbraco.Core.Packaging;
using Umbraco.Extensions;
namespace Umbraco.Cms.Infrastructure.DependencyInjection

1
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
View File

@@ -14,7 +14,6 @@ using Umbraco.Cms.Core.Routing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Infrastructure.Services;
using Umbraco.Cms.Infrastructure.Services.Implement;
using Umbraco.Core.Packaging;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;

8
src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
View File

@@ -10,9 +10,9 @@ using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Collections;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Entities;
using Umbraco.Cms.Core.Models.Packaging;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Serialization;
@@ -20,7 +20,7 @@ using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Extensions;
namespace Umbraco.Core.Packaging
namespace Umbraco.Cms.Core.Packaging
{
public class PackageDataInstallation
{
@@ -483,11 +483,11 @@ namespace Umbraco.Core.Packaging
case IMediaType m:
if (parent is null)
{
return new Media(name, parentId, m) { Key = key, Level = level, SortOrder = sortOrder, } as T;
return new Models.Media(name, parentId, m) { Key = key, Level = level, SortOrder = sortOrder, } as T;
}
else
{
return new Media(name, (IMedia)parent, m) { Key = key, Level = level, SortOrder = sortOrder, } as T;
return new Models.Media(name, (IMedia)parent, m) { Key = key, Level = level, SortOrder = sortOrder, } as T;
}
default:

3
src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs
View File

@@ -5,10 +5,9 @@ using System.Linq;
using System.Xml.Linq;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Models.Packaging;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Extensions;
namespace Umbraco.Core.Packaging
namespace Umbraco.Cms.Core.Packaging
{
public class PackageInstallation : IPackageInstallation
{

1
src/Umbraco.Infrastructure/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
View File

@@ -9,7 +9,6 @@ using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Serialization;
using Umbraco.Core;
using Umbraco.Extensions;
namespace Umbraco.Cms.Core.PropertyEditors

57
src/Umbraco.Infrastructure/WebAssets/Resources.Designer.cs generated
View File

@@ -8,8 +8,10 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Cms.Infrastructure.WebAssets
{
namespace Umbraco.Cms.Infrastructure.WebAssets {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@@ -17,19 +19,19 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
@@ -37,13 +39,13 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Infrastructure.WebAssets.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Cms.Infrastructure.WebAssets.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
@@ -57,9 +59,10 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to [
///
/// &apos;lib/jquery/jquery.min.js&apos;,
/// &apos;lib/jquery-ui/jquery-ui.min.js&apos;,
/// &apos;lib/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js&apos;,
@@ -76,14 +79,14 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
/// &apos;lib/angular-cookies/angular-cookies.js&apos;,
/// &apos;lib/angular-aria/angular-aria.min.js&apos;,
/// &apos;lib/angular-touch/angular-touch.js&apos;,
/// &apos;lib/angula [rest of string was truncated]&quot;;.
/// &apos;lib/ [rest of string was truncated]&quot;;.
/// </summary>
internal static string JsInitialize {
get {
return ResourceManager.GetString("JsInitialize", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to LazyLoad.js(&quot;##JsInitialize##&quot;, function () {
/// //we need to set the legacy UmbClientMgr path
@@ -104,21 +107,21 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
return ResourceManager.GetString("Main", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [
/// &apos;../lib/jquery/jquery.min.js&apos;,
/// &apos;../lib/angular/angular.js&apos;,
/// &apos;../lib/underscore/underscore-min.js&apos;,
/// &apos;../lib/umbraco/Extensions.js&apos;,
/// &apos;../js/app.js&apos;,
/// &apos;../js/umbraco.resources.js&apos;,
/// &apos;../js/umbraco.services.js&apos;,
/// &apos;../js/umbraco.interceptors.js&apos;,
/// &apos;../ServerVariables&apos;,
/// &apos;../lib/signalr/jquery.signalR.js&apos;,
/// &apos;../BackOffice/signalr/hubs&apos;,
/// &apos;../js/umbraco.preview.js&apos;
/// &apos;lib/jquery/jquery.min.js&apos;,
/// &apos;lib/angular/angular.js&apos;,
/// &apos;lib/underscore/underscore-min.js&apos;,
/// &apos;lib/umbraco/Extensions.js&apos;,
/// &apos;js/utilities.js&apos;,
/// &apos;js/app.js&apos;,
/// &apos;js/umbraco.resources.js&apos;,
/// &apos;js/umbraco.services.js&apos;,
/// &apos;js/umbraco.interceptors.js&apos;,
/// &apos;ServerVariables&apos;,
/// &apos;lib/signalr/signalr.min.js&apos;,
/// &apos;js/umbraco.preview.js&apos;
///]
///.
/// </summary>
@@ -127,7 +130,7 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
return ResourceManager.GetString("PreviewInitialize", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to // TODO: This would be nicer as an angular module so it can be injected into stuff... that&apos;d be heaps nicer, but
///// how to do that when this is not a regular JS file, it is a server side JS file and RequireJS seems to only want
@@ -144,7 +147,7 @@ namespace Umbraco.Cms.Infrastructure.WebAssets
return ResourceManager.GetString("ServerVariables", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [
/// &apos;lib/tinymce/tinymce.min.js&apos;,

3
src/Umbraco.ModelsBuilder.Embedded/PublishedElementExtensions.cs
View File

@@ -3,11 +3,10 @@ using System.Linq.Expressions;
using System.Reflection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.ModelsBuilder.Embedded;
using Umbraco.Extensions;
// same namespace as original Umbraco.Web PublishedElementExtensions
// ReSharper disable once CheckNamespace
namespace Umbraco.Core
namespace Umbraco.Extensions
{
/// <summary>
/// Provides extension methods to models.

2
src/Umbraco.Tests.Integration/Umbraco.Core/Packaging/PackageDataInstallationTests.cs
View File

@@ -12,6 +12,7 @@ using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Packaging;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services;
@@ -20,7 +21,6 @@ using Umbraco.Cms.Infrastructure.Persistence.Dtos;
using Umbraco.Cms.Infrastructure.Serialization;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
using Umbraco.Core.Packaging;
using Umbraco.Extensions;
using Umbraco.Tests.Services.Importing;
using Constants = Umbraco.Cms.Core.Constants;

1
src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
View File

@@ -38,7 +38,6 @@ using Umbraco.Cms.Infrastructure.Persistence.Mappers;
using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
using Umbraco.Cms.Tests.Common;
using Umbraco.Cms.Web.Common.AspNetCore;
using Umbraco.Core;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
using File = System.IO.File;

1
src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs
View File

@@ -2,7 +2,6 @@
// See LICENSE for more details.
using NUnit.Framework;
using Umbraco.Cms.Core.WebAssets;
using Umbraco.Cms.Infrastructure.WebAssets;
using Umbraco.Extensions;

1
src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
View File

@@ -24,7 +24,6 @@ using Umbraco.Cms.Web.BackOffice.Routing;
using Umbraco.Cms.Web.BackOffice.Security;
using Umbraco.Cms.Web.BackOffice.Trees;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Core;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;

2
src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
View File

@@ -17,6 +17,7 @@ using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Mapping;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Packaging;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
@@ -24,7 +25,6 @@ using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Web.Common.ActionsResults;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Core.Packaging;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
using ContentType = Umbraco.Cms.Core.Models.ContentType;

1
src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
View File

@@ -39,7 +39,6 @@ using Umbraco.Cms.Web.BackOffice.Security;
using Umbraco.Cms.Web.Common.ActionsResults;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Core;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;

1
src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
View File

@@ -20,7 +20,6 @@ using Umbraco.Cms.Infrastructure;
using Umbraco.Cms.Infrastructure.Search;
using Umbraco.Cms.Web.Common.Attributes;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Core;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;

3
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
View File

@@ -1,5 +1,4 @@
@using Umbraco.Core
@using Umbraco.Cms.Core
@using Umbraco.Cms.Core
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@{