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

Use MS ILogger for DataEditor

Browse Source
This commit is contained in:
Mole
2020-09-18 14:37:19 +02:00
parent d61b9f54fa
commit 578e8c4f9e
81 changed files with 324 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
View File

@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml;
using System.Xml.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Core;
@@ -15,7 +16,6 @@ using Umbraco.Core.Configuration;
using Umbraco.Core.Dictionary;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Packaging;
using Umbraco.Core.PropertyEditors;
@@ -61,7 +61,8 @@ namespace Umbraco.Web.BackOffice.Controllers
private readonly IShortStringHelper _shortStringHelper;
private readonly ILocalizedTextService _localizedTextService;
private readonly IFileService _fileService;
private readonly ILogger _logger;
private readonly ILogger<ContentTypeController> _logger;
private readonly ILoggerFactory _loggerFactory;
private readonly IContentService _contentService;
private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
private readonly ILocalizationService _LocalizationService;
@@ -85,7 +86,8 @@ namespace Umbraco.Web.BackOffice.Controllers
IDataTypeService dataTypeService,
IShortStringHelper shortStringHelper,
IFileService fileService,
ILogger logger,
ILogger<ContentTypeController> logger,
ILoggerFactory loggerFactory,
IContentService contentService,
IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
ILocalizationService localizationService,
@@ -114,6 +116,7 @@ namespace Umbraco.Web.BackOffice.Controllers
_localizedTextService = localizedTextService;
_fileService = fileService;
_logger = logger;
_loggerFactory = loggerFactory;
_contentService = contentService;
_contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
_LocalizationService = localizationService;
@@ -616,7 +619,7 @@ namespace Umbraco.Web.BackOffice.Controllers
return NotFound();
}
var dataInstaller = new PackageDataInstallation(_logger, _fileService, _macroService, _LocalizationService,
var dataInstaller = new PackageDataInstallation(_loggerFactory.CreateLogger<PackageDataInstallation>(), _loggerFactory, _fileService, _macroService, _LocalizationService,
_dataTypeService, _entityService, _contentTypeService, _contentService, _propertyEditors, _scopeProvider, _shortStringHelper, Options.Create(_globalSettings), _localizedTextService);
var xd = new XmlDocument {XmlResolver = null};