Compare commits

...
Author SHA1 Message Date
Paul Johnson 192eb2699b Bump versions to 9.4.3 2022-04-06 08:50:22 +01:00
Paul Johnson ff85abd403 Fix issue - changing a document type broke the nucache data structure (#12209)
(cherry picked from commit 80c90f23d1)
2022-04-06 08:47:59 +01:00
4 changed files with 15 additions and 7 deletions
@@ -24,7 +24,7 @@
"version": {
"type": "parameter",
"datatype": "string",
"defaultValue": "9.4.2",
"defaultValue": "9.4.3",
"description": "The version of Umbraco to load using NuGet",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},
@@ -57,7 +57,7 @@
"version": {
"type": "parameter",
"datatype": "string",
"defaultValue": "9.4.2",
"defaultValue": "9.4.3",
"description": "The version of Umbraco to load using NuGet",
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
},
+4 -4
View File
@@ -3,10 +3,10 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<Version>9.4.2</Version>
<AssemblyVersion>9.4.2</AssemblyVersion>
<InformationalVersion>9.4.2</InformationalVersion>
<FileVersion>9.4.2</FileVersion>
<Version>9.4.3</Version>
<AssemblyVersion>9.4.3</AssemblyVersion>
<InformationalVersion>9.4.3</InformationalVersion>
<FileVersion>9.4.3</FileVersion>
<LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<Company>Umbraco CMS</Company>
@@ -443,10 +443,18 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
refreshedIdsA.Contains(x.ContentTypeId) &&
BuildKit(x, out _)))
{
// replacing the node: must preserve the parents
// replacing the node: must preserve the relations
var node = GetHead(_contentNodes, kit.Node.Id)?.Value;
if (node != null)
{
// Preserve children
kit.Node.FirstChildContentId = node.FirstChildContentId;
kit.Node.LastChildContentId = node.LastChildContentId;
// Also preserve siblings
kit.Node.NextSiblingContentId = node.NextSiblingContentId;
kit.Node.PreviousSiblingContentId = node.PreviousSiblingContentId;
}
SetValueLocked(_contentNodes, kit.Node.Id, kit.Node);