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

Merge remote-tracking branch 'origin/v13/dev' into release/14.0

Browse Source 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Infrastructure/BackgroundJobs/Jobs/ReportSiteJob.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
This commit is contained in:
Nikolaj Geisle
2024-04-17 09:10:05 +02:00
parent 0993a61d39 096991ac79
commit d25c3ca86d
7 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -120,7 +120,18 @@ public static class UmbracoBuilderExtensions
var currFolder = new DirectoryInfo(srcFolder);
var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First();
if (!currFolder.Exists)
{
currFolder = new DirectoryInfo(Path.GetTempPath());
}
var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).FirstOrDefault();
if (uiProject == null)
{
uiProject = new DirectoryInfo(Path.Combine(Path.GetTempPath(), "Umbraco.Web.UI"));
uiProject.Create();
}
var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
return new LocalizedTextServiceFileSources(