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

Adjust namespace in Umbraco.ModelsBuilder.Embedded

Browse Source
This commit is contained in:
Mole
2021-02-10 10:34:27 +01:00
parent 24a56882cd
commit ade00997bc
41 changed files with 45 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreatorFactory.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Core.Configuration;
using Umbraco.Core.Persistence;
namespace Umbraco.Core.Migrations.Install

2
src/Umbraco.Infrastructure/Scoping/ScopeProvider.cs
View File

@@ -7,8 +7,6 @@ using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Core.Cache;
using Umbraco.Core.Events;
using Umbraco.Core.Persistence;
using CoreDebugSettings = Umbraco.Cms.Core.Configuration.Models.CoreDebugSettings;

2
src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs
View File

@@ -2,7 +2,7 @@
using System.Reflection;
using Umbraco.Cms.Core.Semver;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Manages API version handshake between client and server.

2
src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs
View File

@@ -2,7 +2,7 @@
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
/// <summary>
/// Used to validate the aliases for the content type when MB is enabled to ensure that

3
src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Editors;
@@ -11,7 +10,7 @@ using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
public abstract class ContentTypeModelValidatorBase<TModel, TProperty> : EditorValidator<TModel>
where TModel : ContentTypeSave<TProperty>

2
src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs
View File

@@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
internal class DashboardReport
{

2
src/Umbraco.ModelsBuilder.Embedded/BackOffice/MediaTypeModelValidator.cs
View File

@@ -2,7 +2,7 @@
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
/// <summary>
/// Used to validate the aliases for the content type when MB is enabled to ensure that

2
src/Umbraco.ModelsBuilder.Embedded/BackOffice/MemberTypeModelValidator.cs
View File

@@ -2,7 +2,7 @@
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
/// <summary>
/// Used to validate the aliases for the content type when MB is enabled to ensure that

4
src/Umbraco.ModelsBuilder.Embedded/BackOffice/ModelsBuilderDashboardController.cs
View File

@@ -5,12 +5,12 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Web.BackOffice.Controllers;
using Umbraco.Web.Common.Authorization;
namespace Umbraco.ModelsBuilder.Embedded.BackOffice
namespace Umbraco.Cms.ModelsBuilder.Embedded.BackOffice
{
/// <summary>
/// API controller for use in the Umbraco back office with Angular resources

4
src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
View File

@@ -3,11 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
// NOTE
// The idea was to have different types of builder, because I wanted to experiment with

2
src/Umbraco.ModelsBuilder.Embedded/Building/ModelsGenerator.cs
View File

@@ -5,7 +5,7 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
public class ModelsGenerator
{

2
src/Umbraco.ModelsBuilder.Embedded/Building/PropertyModel.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
/// <summary>
/// Represents a model property.

2
src/Umbraco.ModelsBuilder.Embedded/Building/TextBuilder.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Text.RegularExpressions;
using Umbraco.Cms.Core.Configuration.Models;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
/// <summary>
/// Implements a builder that works by writing text.

2
src/Umbraco.ModelsBuilder.Embedded/Building/TextHeaderWriter.cs
View File

@@ -1,6 +1,6 @@
using System.Text;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
internal static class TextHeaderWriter
{

2
src/Umbraco.ModelsBuilder.Embedded/Building/TypeModel.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Umbraco.Cms.Core.Models.PublishedContent;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
/// <summary>
/// Represents a model.

2
src/Umbraco.ModelsBuilder.Embedded/Building/TypeModelHasher.cs
View File

@@ -3,7 +3,7 @@ using System.Linq;
using System.Text;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded.Building
namespace Umbraco.Cms.ModelsBuilder.Embedded.Building
{
internal class TypeModelHasher
{

6
src/Umbraco.ModelsBuilder.Embedded/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -7,8 +7,8 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Cms.ModelsBuilder.Embedded;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
using Umbraco.Web.Common.ModelBinders;
using Umbraco.Web.WebAssets;
@@ -70,7 +70,7 @@ using Umbraco.Web.WebAssets;
* graph includes all of the above mentioned services, all the way up to the RazorProjectEngine and it's LazyMetadataReferenceFeature.
*/
namespace Umbraco.ModelsBuilder.Embedded.DependencyInjection
namespace Umbraco.Extensions
{
/// <summary>
/// Extension methods for <see cref="IUmbracoBuilder"/> for the common Umbraco functionality

7
src/Umbraco.ModelsBuilder.Embedded/DisableModelsBuilderNotificationHandler.cs
View File

@@ -1,10 +1,9 @@
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Features;
using Umbraco.Core.Events;
using Umbraco.ModelsBuilder.Embedded.BackOffice;
using Umbraco.ModelsBuilder.Embedded.DependencyInjection;
using Umbraco.Cms.ModelsBuilder.Embedded.BackOffice;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Used in conjunction with <see cref="UmbracoBuilderExtensions.DisableModelsBuilderControllers"/>

2
src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Indicates that a property implements a given property alias.

8
src/Umbraco.ModelsBuilder.Embedded/LiveModelsProvider.cs
View File

@@ -3,17 +3,13 @@ using System.Threading;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Runtime;
using Umbraco.Core;
using Umbraco.Core.Events;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Web.Cache;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
// supports LiveAppData - but not PureLive
public sealed class LiveModelsProvider : INotificationHandler<UmbracoApplicationStarting>, INotificationHandler<UmbracoRequestEnd>

2
src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderAssemblyAttribute.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Indicates that an Assembly is a Models Builder assembly.

2
src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderDashboard.cs
View File

@@ -2,7 +2,7 @@ using System;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.Dashboards;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
[Weight(40)]
public class ModelsBuilderDashboard : IDashboard

9
src/Umbraco.ModelsBuilder.Embedded/ModelsBuilderNotificationHandler.cs
View File

@@ -10,19 +10,14 @@ using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Core.Configuration;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Cms.ModelsBuilder.Embedded.BackOffice;
using Umbraco.Core.Services.Implement;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.BackOffice;
using Umbraco.Web.Common.ModelBinders;
using Umbraco.Web.WebAssets;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Handles <see cref="UmbracoApplicationStarting"/> and <see cref="ServerVariablesParsing"/> notifications to initialize MB
/// </summary>

2
src/Umbraco.ModelsBuilder.Embedded/ModelsGenerationError.cs
View File

@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
public sealed class ModelsGenerationError
{

2
src/Umbraco.ModelsBuilder.Embedded/OutOfDateModelsStatus.cs
View File

@@ -6,7 +6,7 @@ using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Extensions;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Used to track if ModelsBuilder models are out of date/stale

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

@@ -2,8 +2,8 @@
using System.Linq.Expressions;
using System.Reflection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.ModelsBuilder.Embedded;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded;
// same namespace as original Umbraco.Web PublishedElementExtensions
// ReSharper disable once CheckNamespace

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

@@ -3,9 +3,8 @@ using System.Linq;
using System.Linq.Expressions;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Web.PublishedCache;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// This is called from within the generated model classes

4
src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs
View File

@@ -18,11 +18,11 @@ using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
using File = System.IO.File;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
internal class PureLiveModelFactory : ILivePublishedModelFactory, IRegisteredObject
{

2
src/Umbraco.ModelsBuilder.Embedded/RefreshingRazorViewEngine.cs
View File

@@ -60,7 +60,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines;
* graph includes all of the above mentioned services, all the way up to the RazorProjectEngine and it's LazyMetadataReferenceFeature.
*/
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
/// <summary>
/// Custom <see cref="IRazorViewEngine"/> that wraps aspnetcore's default implementation

2
src/Umbraco.ModelsBuilder.Embedded/RoslynCompiler.cs
View File

@@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Text;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
public class RoslynCompiler
{

2
src/Umbraco.ModelsBuilder.Embedded/TypeExtensions.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
internal static class TypeExtensions
{

1
src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<OutputType>Library</OutputType>
<LangVersion>latest</LangVersion>
<RootNamespace>Umbraco.Cms.ModelsBuilder.Embedded</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">

2
src/Umbraco.ModelsBuilder.Embedded/UmbracoAssemblyLoadContext.cs
View File

@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.Loader;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
internal class UmbracoAssemblyLoadContext : AssemblyLoadContext
{

4
src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
View File

@@ -6,10 +6,10 @@ using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.Building;
namespace Umbraco.ModelsBuilder.Embedded
namespace Umbraco.Cms.ModelsBuilder.Embedded
{
public sealed class UmbracoServices

4
src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
View File

@@ -9,8 +9,8 @@ using NUnit.Framework;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Semver;
using Umbraco.ModelsBuilder.Embedded;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Cms.ModelsBuilder.Embedded;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
{

4
src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
View File

@@ -4,8 +4,8 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
using Umbraco.ModelsBuilder.Embedded;
using Umbraco.ModelsBuilder.Embedded.Building;
using Umbraco.Cms.ModelsBuilder.Embedded;
using Umbraco.Cms.ModelsBuilder.Embedded.Building;
namespace Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
{

5
src/Umbraco.Tests/Cache/PublishedCache/PublishedContentCacheTests.cs
View File

@@ -9,16 +9,11 @@ using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Security;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Web;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Tests.Common;
using Umbraco.Tests.LegacyXmlPublishedCache;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.Testing;
using Umbraco.Web;
using Umbraco.Web.PublishedCache;
namespace Umbraco.Tests.Cache.PublishedCache
{

3
src/Umbraco.Tests/TestHelpers/TestObjects.cs
View File

@@ -9,9 +9,6 @@ using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.IO;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Migrations.Install;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;

1
src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
View File

@@ -11,7 +11,6 @@ using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors;

1
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Extensions;
using Umbraco.ModelsBuilder.Embedded.DependencyInjection;
using Umbraco.Web.BackOffice.DependencyInjection;
using Umbraco.Web.BackOffice.Security;
using Umbraco.Web.Common.DependencyInjection;

1
src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -4,7 +4,6 @@ using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Extensions;
using Umbraco.Infrastructure.DependencyInjection;
using Umbraco.ModelsBuilder.Embedded.DependencyInjection;
using Umbraco.Web.Common.Routing;
using Umbraco.Web.Website.Collections;
using Umbraco.Web.Website.Controllers;