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

Merge branch 'netcore/netcore' into feature/8651-config-options-patten

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.Common/Builders/GlobalSettingsBuilder.cs
#	src/Umbraco.Tests/TEMP/DatabaseContextTests.sdf
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
This commit is contained in:
Andy Butland
2020-08-27 09:03:01 +02:00
parent 4e222f103e 361125e84b
commit 2a59a8385c
979 changed files with 9486 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/HtmlHelperRenderExtensions.cs
View File

@@ -86,6 +86,12 @@ namespace Umbraco.Web
Func<object, ViewDataDictionary, string> contextualKeyBuilder = null)
{
var cacheKey = new StringBuilder(partialViewName);
//let's always cache by the current culture to allow variants to have different cache results
var cultureName = System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
if (!String.IsNullOrEmpty(cultureName))
{
cacheKey.AppendFormat("{0}-", cultureName);
}
if (cacheByPage)
{
if (Current.UmbracoContext == null)

3
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -67,6 +67,9 @@
<Version>2.0.0-alpha.20200128.15</Version>
</PackageReference>
<PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
<PackageReference Include="HtmlSanitizer">
<Version>4.0.217</Version>
</PackageReference>
<PackageReference Include="ImageProcessor">
<Version>2.7.0.100</Version>
</PackageReference>