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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
This commit is contained in:
Bjarke Berg
2020-05-29 13:02:27 +02:00
parent 441b83dae8 dca04b3dd7
commit 58c70c3a90
64 changed files with 873 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -248,7 +248,7 @@ namespace Umbraco.Extensions
var connStrings = configs.ConnectionStrings();
var appSettingMainDomLock = globalSettings.MainDomLock;
var mainDomLock = appSettingMainDomLock == "SqlMainDomLock"
? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator)
? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator, hostingEnvironment)
: new MainDomSemaphoreLock(logger, hostingEnvironment);
var mainDom = new MainDom(logger, mainDomLock);