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/task/6973-migrating-authenticationcontroller

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Mvc/UmbracoController.cs
This commit is contained in:
Shannon
2020-10-22 21:16:44 +11:00
parent d1b35deb43 e9ae1a93c3
commit 2b1dfc5888
238 changed files with 2413 additions and 3987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/Configuration/Models/HealthChecksSettings.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Configuration.HealthChecks;
using Umbraco.Core.HealthCheck;
using Umbraco.Core.HealthCheck.Checks;
namespace Umbraco.Core.Configuration.Models
{

2
src/Umbraco.Core/Configuration/Models/ImagingCacheSettings.cs
View File

@@ -12,6 +12,6 @@ namespace Umbraco.Core.Configuration.Models
public uint CachedNameLength { get; set; } = 8;
public string CacheFolder { get; set; } = Path.Combine("..", "Umbraco", "MediaCache");
public string CacheFolder { get; set; } = Path.Combine("..", "umbraco", "mediacache");
}
}

5
src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs
View File

@@ -5,9 +5,10 @@ namespace Umbraco.Core.Configuration.Models
/// <summary>
/// Represents the models builder configuration.
/// </summary>
public class ModelsBuilderSettings
public class ModelsBuilderSettings
{
public static string DefaultModelsDirectory => "~/App_Data/Models";
// TODO: This should not go into App_Data - that folder isn't really a real thing anymore
public static string DefaultModelsDirectory => "~/umbraco/models";
/// <summary>
/// Gets a value indicating whether the whole models experience is enabled.