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

Merge branch 'netcore/netcore' into netcore/feature/websecurity

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/OnlyLocalRequestsAttribute.cs
This commit is contained in:
Shannon
2020-06-03 13:26:40 +10:00
parent c6481bdabb a7a463c7d4
commit 7ac01fc02f
103 changed files with 2234 additions and 1159 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);