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

Change name of ContentApp back

Browse Source
This commit is contained in:
Mole
2020-09-24 10:29:53 +02:00
parent 2779b19737
commit 7369ffc5fd
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/ContentApps/ContentInfoContentAppFactory.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Web.ContentApps
return _contentApp ?? (_contentApp = new ContentApp
{
Alias = "umbInfo",
Name = "LogInformation",
Name = "Info",
Icon = "icon-info",
View = "views/content/apps/info/info.html",
Weight = Weight
@@ -33,7 +33,7 @@ namespace Umbraco.Web.ContentApps
return _mediaApp ?? (_mediaApp = new ContentApp
{
Alias = "umbInfo",
Name = "LogInformation",
Name = "Info",
Icon = "icon-info",
View = "views/media/apps/info/info.html",
Weight = Weight
@@ -42,7 +42,7 @@ namespace Umbraco.Web.ContentApps
return _memberApp ?? (_memberApp = new ContentApp
{
Alias = "umbInfo",
Name = "LogInformation",
Name = "Info",
Icon = "icon-info",
View = "views/member/apps/info/info.html",
Weight = Weight

11
src/Umbraco.Core/IO/FileSystems.cs
View File

@@ -130,11 +130,12 @@ namespace Umbraco.Core.IO
// but it does not really matter what we return - here, null
private object CreateWellKnownFileSystems()
{
var macroPartialFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger<PhysicalFileSystem>(), Constants.SystemDirectories.MacroPartials);
var partialViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger<PhysicalFileSystem>(), Constants.SystemDirectories.PartialViews);
var stylesheetsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger<PhysicalFileSystem>(), _globalSettings.UmbracoCssPath);
var scriptsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger<PhysicalFileSystem>(), _globalSettings.UmbracoScriptsPath);
var mvcViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, _loggerFactory.CreateLogger<PhysicalFileSystem>(), Constants.SystemDirectories.MvcViews);
var logger = _loggerFactory.CreateLogger<PhysicalFileSystem>();
var macroPartialFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.MacroPartials);
var partialViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.PartialViews);
var stylesheetsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, _globalSettings.UmbracoCssPath);
var scriptsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, _globalSettings.UmbracoScriptsPath);
var mvcViewsFileSystem = new PhysicalFileSystem(_ioHelper, _hostingEnvironment, logger, Constants.SystemDirectories.MvcViews);
_macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, _ioHelper, _hostingEnvironment, _loggerFactory,"macro-partials", IsScoped);
_partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, _ioHelper, _hostingEnvironment, _loggerFactory,"partials", IsScoped);

4
src/Umbraco.Core/Logging/DisposableTimer.cs
View File

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Logging
/// </summary>
public class DisposableTimer : DisposableObjectSlim
{
private readonly Microsoft.Extensions.Logging.ILogger _logger;
private readonly ILogger _logger;
private readonly LogLevel _level;
private readonly Type _loggerType;
private readonly int _thresholdMilliseconds;
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Logging
private readonly string _timingId;
// internal - created by profiling logger
internal DisposableTimer(Microsoft.Extensions.Logging.ILogger logger, LogLevel level, IProfiler profiler, Type loggerType,
internal DisposableTimer(ILogger logger, LogLevel level, IProfiler profiler, Type loggerType,
string startMessage, string endMessage, string failMessage = null,
int thresholdMilliseconds = 0)
{

4
src/Umbraco.Core/Logging/LogProfiler.cs
View File

@@ -9,9 +9,9 @@ namespace Umbraco.Core.Logging
/// </summary>
public class LogProfiler : IProfiler
{
private readonly Microsoft.Extensions.Logging.ILogger<LogProfiler> _logger;
private readonly ILogger<LogProfiler> _logger;
public LogProfiler(Microsoft.Extensions.Logging.ILogger<LogProfiler> logger)
public LogProfiler(ILogger<LogProfiler> logger)
{
_logger = logger;
}