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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-infrastructure-namespaces

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderDependencyInjectionExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
This commit is contained in:
Mole
2021-02-22 15:18:04 +01:00
parent 815d4fd226 9123c06aec
commit 405d0e704d
69 changed files with 312 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Reflection;
using Microsoft.Extensions.Logging;
@@ -21,7 +21,6 @@ namespace Umbraco.Cms.Core.Composing
"Umbraco.Core",
"Umbraco.Infrastructure",
"Umbraco.PublishedCache.NuCache",
"Umbraco.ModelsBuilder.Embedded",
"Umbraco.Examine.Lucene",
"Umbraco.Web.Common",
"Umbraco.Web.BackOffice",

17
src/Umbraco.Core/Dashboards/ModelsBuilderDashboard.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using Umbraco.Cms.Core.Composing;
namespace Umbraco.Cms.Core.Dashboards
{
[Weight(40)]
public class ModelsBuilderDashboard : IDashboard
{
public string Alias => "settingsModelsBuilder";
public string[] Sections => new [] { "settings" };
public string View => "views/dashboard/settings/modelsbuildermanagement.html";
public IAccessRule[] AccessRules => Array.Empty<IAccessRule>();
}
}

2
src/Umbraco.Core/IO/ViewHelper.cs
View File

@@ -71,7 +71,7 @@ namespace Umbraco.Cms.Core.IO
// @inherits Umbraco.Web.Mvc.UmbracoViewPage
// @inherits Umbraco.Web.Mvc.UmbracoViewPage<ModelClass>
content.AppendLine("@using Umbraco.Cms.Web.Common.PublishedModels;");
content.Append("@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage");
content.Append("@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage");
if (modelClassName.IsNullOrWhiteSpace() == false)
{
content.Append("<");

1
src/Umbraco.Core/Properties/AssemblyInfo.cs
View File

@@ -8,7 +8,6 @@ using System.Runtime.InteropServices;
// Umbraco Cms
[assembly: InternalsVisibleTo("Umbraco.Web")]
[assembly: InternalsVisibleTo("Umbraco.Web.UI")]
[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.Embedded")]
[assembly: InternalsVisibleTo("Umbraco.Tests")]
[assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]