Merge remote-tracking branch 'origin/v9/dev' into v10/dev

# Conflicts:
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Directory.Build.props
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTask.cs
#	tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
This commit is contained in:
Bjarke Berg
2022-02-13 13:34:40 +01:00
64 changed files with 1154 additions and 419 deletions

View File

@@ -1,3 +1,4 @@
using System;
using System.Linq;
using Umbraco.Cms.Core.PublishedCache;
@@ -9,7 +10,8 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
{
var assigned = domainCache.GetAssigned(documentId, includeWildcards);
return culture is null ? assigned.Any() : assigned.Any(x => x.Culture == culture);
// It's super important that we always compare cultures with ignore case, since we can't be sure of the casing!
return culture is null ? assigned.Any() : assigned.Any(x => x.Culture.Equals(culture, StringComparison.InvariantCultureIgnoreCase));
}
}
}