Update ResourceManager.cs to better handle resources that don't speci…

…fy a version (OrchardCMS#14992)
urbanit · Mar 18, 2024 · d4234c4 · d4234c4
1 parent 8491d29
commit d4234c4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs b/src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
@@ -206,9 +206,8 @@ private static ResourceDefinition FindMatchingResource(
                             }
                         }
 
-                        // Use the highest version of all matches.
-                        if (resource == null
-                            || (resourceDefinition.Version != null && new Version(resource.Version) < version))
+                        // Use the highest version of all matches. Resources that don't specify a version have the lowest priority.
+                        if (resource?.Version is null || new Version(resource.Version) < version)
                         {
                             resource = resourceDefinition;
                         }

diff --git a/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs b/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs
@@ -43,6 +43,38 @@ public void FindResourceFromManifestProviders()
             Assert.Contains("attr", ((IDictionary<string, string>)resourceDefinition.Attributes).Keys);
         }
 
+        [Fact]
+        public void FindHighestVersionedResourceFromManifest()
+        {
+            var options = new ResourceManagementOptions();
+            var manifest = new ResourceManifest();
+
+            manifest.DefineResource("foo", "bar")
+                .SetUrl("~/bar1.js");
+            manifest.DefineResource("foo", "bar")
+                .SetUrl("~/bar2.js")
+                .SetVersion("1.0.0");
+            manifest.DefineResource("foo", "bar")
+                .SetUrl("~/bar3.js")
+                .SetVersion("2.0.0");
+            manifest.DefineResource("foo", "bar")
+                .SetUrl("~/bar4.js");
+
+            options.ResourceManifests.Add(manifest);
+
+            var resourceManager = new ResourceManager(
+                new OptionsWrapper<ResourceManagementOptions>(options),
+                StubFileVersionProvider.Instance
+            );
+
+            var resourceDefinition = resourceManager.FindResource(new RequireSettings { Type = "foo", Name = "bar" });
+            Assert.NotNull(resourceDefinition);
+            Assert.Equal("foo", resourceDefinition.Type);
+            Assert.Equal("bar", resourceDefinition.Name);
+            Assert.Contains("~/bar3.js", resourceDefinition.Url);
+            Assert.Contains("2.0.0", resourceDefinition.Version);
+        }
+
         [Fact]
         public void RegisterResouceUrl()
         {