Merge branch 'release/3.817.0'

Author: vc-ci

Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.816.0</VersionPrefix>
+    <VersionPrefix>3.817.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

src/VirtoCommerce.CoreModule.Core/Seo/CompositeSeoResolver.cs

@@ -18,9 +18,15 @@ public CompositeSeoResolver(IEnumerable<ISeoResolver> resolvers, CompositeSeoByS
     public async Task<IList<SeoInfo>> FindSeoAsync(SeoSearchCriteria criteria)
     {
         var tasks = _resolvers.Select(x => x.FindSeoAsync(criteria)).ToArray();
-        var result = (await Task.WhenAll(tasks)).SelectMany(x => x).Where(x => x.ObjectId != null && x.ObjectType != null).Distinct();
+        var result = (await Task.WhenAll(tasks)).SelectMany(x => x).Where(x => x.ObjectId != null && x.ObjectType != null).Distinct().ToList();
+
+        if (result.Count > 0)
+        {
+            return result;
+        }
+
         var fallbackResults = await _seoBySlugResolver.FindSeoBySlugAsync(criteria.Slug);
-        return result.Union(fallbackResults).ToList();
+        return fallbackResults;
     }
 }
 

src/VirtoCommerce.CoreModule.Web/module.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Core</id>
-  <version>3.816.0</version>
+  <version>3.817.0</version>
   <version-tag />
   <platformVersion>3.877.0</platformVersion>
   <title>Commerce core module</title>