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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/boot-failed-exception

Browse Source
This commit is contained in:
Shannon
2020-05-18 16:20:25 +10:00
parent 3d9603e669 c36c2f6a33
commit 06ce62d922
33 changed files with 1039 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Linq;
using System.Threading;
@@ -15,7 +14,6 @@ using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
using Umbraco.Core.Manifest;
using Umbraco.Web.Models;
using Umbraco.Web.Mvc;
using Umbraco.Core.Services;
@@ -23,12 +21,9 @@ using Umbraco.Web.Features;
using Umbraco.Web.Models.Identity;
using Umbraco.Web.Security;
using Constants = Umbraco.Core.Constants;
using JArray = Newtonsoft.Json.Linq.JArray;
using Umbraco.Core.Configuration.Grid;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Runtime;
using Umbraco.Core.WebAssets;
using Umbraco.Web.Trees;
using Umbraco.Web.WebAssets;
@@ -52,7 +47,6 @@ namespace Umbraco.Web.Editors
private readonly IContentSettings _contentSettings;
private readonly TreeCollection _treeCollection;
private readonly IHostingEnvironment _hostingEnvironment;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IRuntimeSettings _runtimeSettings;
private readonly ISecuritySettings _securitySettings;
private readonly IRuntimeMinifier _runtimeMinifier;
@@ -84,7 +78,6 @@ namespace Umbraco.Web.Editors
_contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
_treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
_hostingEnvironment = hostingEnvironment;
_httpContextAccessor = httpContextAccessor;
_runtimeSettings = settings;
_securitySettings = securitySettings;
_runtimeMinifier = runtimeMinifier;
@@ -194,6 +187,7 @@ namespace Umbraco.Web.Editors
/// </summary>
/// <param name="culture"></param>
/// <returns></returns>
/// <remarks>Migrated already to .Net Core</remarks>
[HttpGet]
public JsonNetResult LocalizedText(string culture = null)
{
@@ -240,6 +234,7 @@ namespace Umbraco.Web.Editors
return JavaScript(result);
}
/// Migrated already to .Net Core
[UmbracoAuthorize(Order = 0)]
[HttpGet]
public JsonNetResult GetGridConfig()
@@ -257,7 +252,7 @@ namespace Umbraco.Web.Editors
[MinifyJavaScriptResult(Order = 1)]
public JavaScriptResult ServerVariables()
{
var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _httpContextAccessor, _hostingEnvironment, _runtimeSettings, _securitySettings, _runtimeMinifier);
var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings, _umbracoVersion, _contentSettings, _treeCollection, _hostingEnvironment, _runtimeSettings, _securitySettings, _runtimeMinifier);
//cache the result if debugging is disabled
var result = _hostingEnvironment.IsDebugMode

2
src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
View File

@@ -51,7 +51,6 @@ namespace Umbraco.Web.Editors
IUmbracoVersion umbracoVersion,
IContentSettings contentSettings,
TreeCollection treeCollection,
IHttpContextAccessor httpContextAccessor,
IHostingEnvironment hostingEnvironment,
IRuntimeSettings settings,
ISecuritySettings securitySettings,
@@ -64,7 +63,6 @@ namespace Umbraco.Web.Editors
_umbracoVersion = umbracoVersion;
_contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
_treeCollection = treeCollection ?? throw new ArgumentNullException(nameof(treeCollection));
_httpContextAccessor = httpContextAccessor;
_hostingEnvironment = hostingEnvironment;
_settings = settings;
_securitySettings = securitySettings;

4
src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
View File

@@ -46,9 +46,9 @@ namespace Umbraco.Web
/// These are the bare minimal server variables that are required for the application to start without being authenticated,
/// we will load the rest of the server vars after the user is authenticated.
/// </remarks>
public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IContentSettings contentSettings, TreeCollection treeCollection, IHttpContextAccessor httpContextAccessor, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings, IRuntimeMinifier runtimeMinifier)
public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, UmbracoFeatures features, IGlobalSettings globalSettings, IUmbracoVersion umbracoVersion, IContentSettings contentSettings, TreeCollection treeCollection, IHostingEnvironment hostingEnvironment, IRuntimeSettings settings, ISecuritySettings securitySettings, IRuntimeMinifier runtimeMinifier)
{
var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, contentSettings, treeCollection, httpContextAccessor, hostingEnvironment, settings, securitySettings, runtimeMinifier);
var serverVars = new BackOfficeServerVariables(uri, Current.RuntimeState, features, globalSettings, umbracoVersion, contentSettings, treeCollection, hostingEnvironment, settings, securitySettings, runtimeMinifier);
var minVars = serverVars.BareMinimumServerVariables();
var str = @"<script type=""text/javascript"">

1
src/Umbraco.Web/Mvc/JsonNetResult.cs
View File

@@ -13,6 +13,7 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Custom json result using newtonsoft json.net
/// </summary>
/// Migrated already to .Net Core
public class JsonNetResult : ActionResult
{
public Encoding ContentEncoding { get; set; }

1
src/Umbraco.Web/Mvc/RedirectToUmbracoPageResult.cs
View File

@@ -14,6 +14,7 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Redirects to an Umbraco page by Id or Entity
/// </summary>
/// Migrated already to .Net Core
public class RedirectToUmbracoPageResult : ActionResult
{
private IPublishedContent _publishedContent;

1
src/Umbraco.Web/Mvc/RedirectToUmbracoUrlResult.cs
View File

@@ -11,6 +11,7 @@ namespace Umbraco.Web.Mvc
/// to the current page but the current page is actually a rewritten URL normally done with something like
/// Server.Transfer. It is also handy if you want to persist the query strings.
/// </remarks>
/// Migrated already to .Net Core
public class RedirectToUmbracoUrlResult : ActionResult
{
private readonly IUmbracoContext _umbracoContext;

1
src/Umbraco.Web/Mvc/RouteDefinition.cs
View File

@@ -7,6 +7,7 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Represents the data required to route to a specific controller/action during an Umbraco request
/// </summary>
/// Migrated already to .Net Core
public class RouteDefinition
{
public string ControllerName { get; set; }

2
src/Umbraco.Web/Mvc/SurfaceController.cs
View File

@@ -13,6 +13,8 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Provides a base class for front-end add-in controllers.
/// </summary>
/// Migrated already to .Net Core without MergeModelStateToChildAction and MergeParentContextViewData action filters
/// TODO: Migrate MergeModelStateToChildAction and MergeParentContextViewData action filters
[MergeModelStateToChildAction]
[MergeParentContextViewData]
public abstract class SurfaceController : PluginController

1
src/Umbraco.Web/Mvc/UmbracoPageResult.cs
View File

@@ -10,6 +10,7 @@ namespace Umbraco.Web.Mvc
/// <summary>
/// Used by posted forms to proxy the result to the page in which the current URL matches on
/// </summary>
/// Migrated already to .Net Core
public class UmbracoPageResult : ActionResult
{
private readonly IProfilingLogger _profilingLogger;