Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/corehost/cli/fxr/fx_muxer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -692,9 +692,11 @@ pal::string_t resolve_sdk_version(pal::string_t sdk_path, bool parse_only_produc
if (fx_ver_t::parse(version, &ver, parse_only_production))
{
if (global_cli_version.empty() ||
// Pick the greatest version that differs only in the 'minor-patch' if a global cli version is specified.
// If a global cli version is specified:
// pick the greatest version that differs only in the 'minor-patch'
// and is semantically greater than or equal to the global cli version specified.
(ver.get_major() == specified.get_major() && ver.get_minor() == specified.get_minor() &&
(ver.get_patch() / 100) == (specified.get_patch() / 100)))
(ver.get_patch() / 100) == (specified.get_patch() / 100) && ver >= specified))
{
max_ver = std::max(ver, max_ver);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9999.0.0-global-dummy"
"version": "9999.3.4-global-dummy"
}
}
2 changes: 1 addition & 1 deletion src/test/Assets/TestUtils/SDKLookup/TwoPart-global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9999.0.300-global-dummy"
"version": "9999.3.304-global-dummy"
}
}
Loading