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

Cleanup usages of Configs

Browse Source
This commit is contained in:
Bjarke Berg
2020-09-08 13:03:43 +02:00
parent 3efee8284a
commit e079bd5a50
59 changed files with 265 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Tests.Integration/Testing/IntegrationTestComposer.cs
View File

@@ -3,10 +3,12 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Linq;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
@@ -57,7 +59,7 @@ namespace Umbraco.Tests.Integration.Testing
/// <returns></returns>
private ILocalizedTextService GetLocalizedTextService(IFactory factory)
{
var configs = factory.GetInstance<Configs>();
var globalSettings = factory.GetInstance<IOptions<GlobalSettings>>();
var logger = factory.GetInstance<ILogger>();
var appCaches = factory.GetInstance<AppCaches>();
@@ -71,7 +73,7 @@ namespace Umbraco.Tests.Integration.Testing
currFolder = currFolder.Parent;
}
var netcoreUI = currFolder.GetDirectories("Umbraco.Web.UI.NetCore", SearchOption.TopDirectoryOnly).First();
var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, configs.Global().UmbracoPath.TrimStart("~/"), "config", "lang"));
var mainLangFolder = new DirectoryInfo(Path.Combine(netcoreUI.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
return new LocalizedTextServiceFileSources(
logger,