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

Finish removing IOHelper.MapPath references

Browse Source
This commit is contained in:
Benjamin Carleski
2020-11-18 08:10:16 -08:00
parent 7583c1fb06
commit 2309bb9d5b
17 changed files with 93 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/WebApi/HttpActionContextExtensions.cs
View File

@@ -8,8 +8,7 @@ using System.Web.Http.Controllers;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;
using Umbraco.Web.Composing;
using Umbraco.Core.IO;
using Umbraco.Core;
using Umbraco.Core.Hosting;
namespace Umbraco.Web.WebApi
{
@@ -61,8 +60,8 @@ namespace Umbraco.Web.WebApi
throw new HttpResponseException(HttpStatusCode.UnsupportedMediaType);
}
var ioHelper = Current.Factory.GetRequiredService<IIOHelper>();
var root = ioHelper.MapPath(rootVirtualPath);
var hostingEnvironment = Current.Factory.GetRequiredService<IHostingEnvironment>();
var root = hostingEnvironment.MapPathContentRoot(rootVirtualPath);
//ensure it exists
Directory.CreateDirectory(root);
var provider = new MultipartFormDataStreamProvider(root);

6
src/Umbraco.Web/WebAssets/CDF/ClientDependencyConfiguration.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Logging;
using ClientDependency.Core.CompositeFiles.Providers;
using ClientDependency.Core.Config;
using Semver;
using Umbraco.Core.IO;
using Umbraco.Core.Hosting;
namespace Umbraco.Web.WebAssets.CDF
{
@@ -28,11 +28,11 @@ namespace Umbraco.Web.WebAssets.CDF
set => XmlFileMapper.FileMapDefaultFolder = value;
}
public ClientDependencyConfiguration(ILogger<ClientDependencyConfiguration> logger, IIOHelper ioHelper)
public ClientDependencyConfiguration(ILogger<ClientDependencyConfiguration> logger, IHostingEnvironment hostingEnvironment)
{
if (logger == null) throw new ArgumentNullException("logger");
_logger = logger;
_fileName = ioHelper.MapPath(string.Format("{0}/ClientDependency.config", Core.Constants.SystemDirectories.Config));
_fileName = hostingEnvironment.MapPathContentRoot(string.Format("{0}/ClientDependency.config", Core.Constants.SystemDirectories.Config));
}
/// <summary>

13
src/Umbraco.Web/WebAssets/CDF/ClientDependencyRuntimeMinifier.cs
View File

@@ -4,25 +4,22 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using System.Web;
using Microsoft.Extensions.Logging;
using ClientDependency.Core;
using ClientDependency.Core.CompositeFiles;
using ClientDependency.Core.Config;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Manifest;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.WebAssets;
using CssFile = ClientDependency.Core.CssFile;
using JavascriptFile = ClientDependency.Core.JavascriptFile;
using Umbraco.Core.Hosting;
namespace Umbraco.Web.WebAssets.CDF
{
public class ClientDependencyRuntimeMinifier : IRuntimeMinifier
{
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IIOHelper _ioHelper;
private readonly IHostingEnvironment _hostingEnvironment;
private readonly ILoggerFactory _loggerFactory;
private readonly ILogger<ClientDependencyRuntimeMinifier> _logger;
private readonly IUmbracoVersion _umbracoVersion;
@@ -31,12 +28,12 @@ namespace Umbraco.Web.WebAssets.CDF
public ClientDependencyRuntimeMinifier(
IHttpContextAccessor httpContextAccessor,
IIOHelper ioHelper,
IHostingEnvironment hostingEnvironment,
ILoggerFactory loggerFactory,
IUmbracoVersion umbracoVersion)
{
_httpContextAccessor = httpContextAccessor;
_ioHelper = ioHelper;
_hostingEnvironment = hostingEnvironment;
_loggerFactory = loggerFactory;
_logger = _loggerFactory.CreateLogger<ClientDependencyRuntimeMinifier>();
_umbracoVersion = umbracoVersion;
@@ -109,7 +106,7 @@ namespace Umbraco.Web.WebAssets.CDF
public void Reset()
{
// Update ClientDependency version
var clientDependencyConfig = new ClientDependencyConfiguration(_loggerFactory.CreateLogger<ClientDependencyConfiguration>(), _ioHelper);
var clientDependencyConfig = new ClientDependencyConfiguration(_loggerFactory.CreateLogger<ClientDependencyConfiguration>(), _hostingEnvironment);
var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
_umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
// Delete ClientDependency temp directories to make sure we get fresh caches