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

Merge branch 'v10/dev' into v10/contrib

Browse Source 
# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
This commit is contained in:
Sebastiaan Janssen
2022-09-19 16:48:36 +02:00
parent 0b1295d05b b2b2903a6e
commit 85e31bd12d
202 changed files with 5381 additions and 2298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.PublishedCache.NuCache/ContentCache.cs
View File

@@ -243,7 +243,7 @@ public class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigab
IPublishedContent? rootNode = GetByRoute(preview, "/", true);
if (rootNode == null)
{
throw new Exception("Failed to get node at /.");
throw new Exception("Failed to get node at /. This might be because you're trying to publish a variant, with no domains setup");
}
// remove only if we're the default node

2
src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
View File

@@ -18,7 +18,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MessagePack" Version="2.3.85" />
<PackageReference Include="MessagePack" Version="2.4.35" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Umbraco.Code" Version="2.0.0">