Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Refactor path construction to use IWebHostEnvironment
KrzysztofPajak05f1ba2f6f35
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.csindex 7c830fc1e..f2c69dd6e 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs@@ -1,5 +1,4 @@using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.SharedKernel.Extensions;using Microsoft.Extensions.DependencyInjection;namespace Grand.Business.System.Services.Installation;@@ -12,7 +11,7 @@ public partial class InstallationServicevar language = _languageRepository.Table.Single(l => l.Name == "English");//save resources- var filePath = CommonPath.MapPath("App_Data/Resources/DefaultLanguage.xml");+ var filePath = Path.Combine(_hostingEnvironment.ContentRootPath, "App_Data/Resources/DefaultLanguage.xml");var localesXml = File.ReadAllText(filePath);var translationService = _serviceProvider.GetRequiredService<ITranslationService>();await translationService.ImportResourcesFromXmlInstall(language, localesXml);diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.csindex 2782d5489..f3df7b6e8 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs@@ -1,6 +1,7 @@using Grand.Business.Core.Interfaces.System.Installation;using Grand.Business.Core.Utilities.System;using Grand.SharedKernel.Extensions;+using Microsoft.AspNetCore.Hosting;using System.Text.RegularExpressions;using System.Xml;@@ -9,7 +10,7 @@ namespace Grand.Business.System.Services.Installation;/// <summary>/// Translation service for installation process/// </summary>-public class InstallationLocalizedService : IInstallationLocalizedService+public class InstallationLocalizedService(IWebHostEnvironment hostingEnvironment) : IInstallationLocalizedService{/// <summary>/// Available collation@@ -21,6 +22,8 @@ public class InstallationLocalizedService : IInstallationLocalizedService/// </summary>private IList<InstallationLanguage> _availableLanguages;+ private readonly IWebHostEnvironment _hostingEnvironment = hostingEnvironment;+/// <summary>/// Get locale resource value/// </summary>@@ -80,8 +83,8 @@ public class InstallationLocalizedService : IInstallationLocalizedServicereturn _availableLanguages;_availableLanguages = new List<InstallationLanguage>();- foreach (var filePath in Directory.EnumerateFiles(CommonPath.MapPath("App_Data/Resources/Installation/"),- "*.xml"))+ var path = Path.Combine(_hostingEnvironment.ContentRootPath, "App_Data/Resources/Installation");+ foreach (var filePath in Directory.EnumerateFiles(path, "*.xml")){var xmlDocument = new XmlDocument();xmlDocument.Load(File.OpenRead(filePath));@@ -162,7 +165,7 @@ public class InstallationLocalizedService : IInstallationLocalizedServicereturn _availableCollation;_availableCollation = new List<InstallationCollation>();- var filePath = CommonPath.MapPath("App_Data/Resources/supportedcollation.xml");+ var filePath = Path.Combine(_hostingEnvironment.ContentRootPath, "App_Data/Resources/supportedcollation.xml");var xmlDocument = new XmlDocument { XmlResolver = null };xmlDocument.Load(File.OpenRead(filePath));diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.csindex 8c6e337fe..affc556ae 100644--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs@@ -1,7 +1,7 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Data;using Grand.Domain.Localization;-using Grand.SharedKernel.Extensions;+using Microsoft.AspNetCore.Hosting;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Logging;@@ -13,8 +13,8 @@ public static class MigrationUpdateResourcestring filename){var langRepository = serviceProvider.GetRequiredService<IRepository<Language>>();- var logService = serviceProvider.GetRequiredService<ILoggerFactory>()- .CreateLogger("ImportLanguageResourcesFromXml");+ var logService = serviceProvider.GetRequiredService<ILoggerFactory>().CreateLogger("ImportLanguageResourcesFromXml");+ var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();var translationService = serviceProvider.GetRequiredService<ITranslationService>();try@@ -22,7 +22,7 @@ public static class MigrationUpdateResourcevar language = langRepository.Table.FirstOrDefault(l => l.Name == "English") ??langRepository.Table.FirstOrDefault();- var filePath = CommonPath.MapPath(filename);+ var filePath = Path.Combine(hostingEnvironment.ContentRootPath, filename);var localesXml = File.ReadAllText(filePath);translationService.ImportResourcesFromXmlInstall(language, localesXml).GetAwaiter().GetResult();}diff --git a/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs b/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.csindex e8877da2d..5a3b9aba0 100644--- a/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs+++ b/src/Core/Grand.Infrastructure/Roslyn/RoslynCompiler.cs@@ -1,10 +1,12 @@using Grand.Infrastructure.Configuration;using Grand.SharedKernel.Extensions;+using Microsoft.AspNetCore.Hosting;using Microsoft.AspNetCore.Mvc.ApplicationParts;using Microsoft.CodeAnalysis;using Microsoft.CodeAnalysis.CSharp.Scripting;using Microsoft.CodeAnalysis.Scripting;using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.Hosting.Internal;using System.Collections.Immutable;using System.Diagnostics;using System.Runtime.Loader;@@ -24,7 +26,7 @@ public static class RoslynCompiler/// </summary>public static IEnumerable<ResultCompiler> ReferencedScripts { get; set; }- public static void Load(ApplicationPartManager applicationPartManager, IConfiguration configuration)+ public static void Load(ApplicationPartManager applicationPartManager, IConfiguration configuration, IWebHostEnvironment webHostEnvironment){ArgumentNullException.ThrowIfNull(applicationPartManager);@@ -36,9 +38,9 @@ public static class RoslynCompilervar referencedScripts = new List<ResultCompiler>();- var roslynFolder = new DirectoryInfo(CommonPath.MapPath(ScriptPath));+ var roslynFolder = new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, ScriptPath));+ _shadowCopyScriptPath = new DirectoryInfo(Path.Combine(webHostEnvironment.ContentRootPath, ShadowCopyScriptPath));- _shadowCopyScriptPath = new DirectoryInfo(CommonPath.MapPath(ShadowCopyScriptPath));Directory.CreateDirectory(_shadowCopyScriptPath.FullName);//clear bin filesdiff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex b1773f49d..636af49a7 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -131,7 +131,7 @@ public static class StartupBasePluginManager.Load(mvcCoreBuilder, configuration, hostEnvironment);//Load CTX scripts- RoslynCompiler.Load(mvcCoreBuilder.PartManager, configuration);+ RoslynCompiler.Load(mvcCoreBuilder.PartManager, configuration, hostEnvironment);}/// <summary>diff --git a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs b/src/Core/Grand.SharedKernel/Extensions/CommonPath.csindex d9e253c94..90e6ac912 100644--- a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs+++ b/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs@@ -29,14 +29,4 @@ public static class CommonPath/// </summary>public static string WebHostEnvironment { get; set; }- /// <summary>- /// Maps a path to a physical disk path.- /// </summary>- /// <param name="path">The path to map. E.g. "~/bin"</param>- /// <returns>The physical path. E.g. "c:\inetpub\wwwroot\bin"</returns>- public static string MapPath(string path)- {- path = path.Replace("~/", "").TrimStart('/');- return Path.Combine(BaseDirectory, path);- }}\ No newline at end of filediff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.csindex 199416aeb..6243c7c16 100644--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs@@ -4,6 +4,7 @@ using Grand.Data;using Grand.Domain.Common;using Grand.Infrastructure.Plugins;using Grand.SharedKernel.Extensions;+using Microsoft.AspNetCore.Hosting;using Widgets.Slider.Domain;namespace Widgets.Slider;@@ -15,7 +16,8 @@ public class SliderWidgetPlugin(IPictureService pictureService,IRepository<PictureSlider> pictureSliderRepository,IDatabaseContext databaseContext,- IPluginTranslateResource pluginTranslateResource)+ IPluginTranslateResource pluginTranslateResource,+ IWebHostEnvironment webHostEnvironment): BasePlugin, IPlugin{@@ -30,7 +32,7 @@ public class SliderWidgetPlugin("SliderTypeId_DisplayOrder");//pictures- var sampleImagesPath = CommonPath.MapPath("Plugins/Widgets.Slider/Assets/slider/sample-images/");+ var sampleImagesPath = Path.Combine(webHostEnvironment.ContentRootPath, "Plugins/Widgets.Slider/Assets/slider/sample-images/");var byte1 = await File.ReadAllBytesAsync(sampleImagesPath + "banner1.png");var byte2 = await File.ReadAllBytesAsync(sampleImagesPath + "banner2.png");