Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ResourceManager.cs to better handle resources that don't specify a version #14992

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Update ResourceManager.cs to better handle resources that don't specify a version #14992

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b362b77
Update ResourceManager.cs to better handle resources that don't speci…
mroskamp Jan 5, 2024
9f58a03
Update src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
mroskamp Jan 5, 2024
2952855
Add unit test to exercise finding the highest version resource defini…
mroskamp Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/OrchardCore/OrchardCore.ResourceManagement/ResourceManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 == null || resource.Version == null || new Version(resource.Version) < version)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please simplify code to this

resource?.Version is null

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeAlhayek you could use the suggest feature in GitHub instead of writing the code yourself, it's quite helpful

mroskamp marked this conversation as resolved.
Show resolved Hide resolved
{
resource = resourceDefinition;
}
Expand Down