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

Bump maximum ICU library version in Unix System.Globalization.Native #34095

Merged
merged 2 commits into from
Mar 30, 2020
Merged

Bump maximum ICU library version in Unix System.Globalization.Native #34095

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55c004f
Bump maximum ICU library version we scan in System.Globalization.Nati…
janvorli Mar 25, 2020
cbf07d5
Reflect PR feedback
janvorli Mar 26, 2020
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
12 changes: 3 additions & 9 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ static int FindICULibs(char* symbolName, char* symbolVersion)
// Version ranges to search for each of the three version components
// The rationale for major version range is that we support versions higher or
// equal to the version we are built against and less or equal to that version
// plus 20 to give us enough headspace. The ICU seems to version about twice
// plus 30 to give us enough headspace. The ICU seems to version about twice
// a year.
// On some platforms (mainly Alpine Linux) we want to make our minimum version
// an earlier version than what we build that we know we support.
#define MinICUVersion 50
#define MaxICUVersion (U_ICU_VERSION_MAJOR_NUM + 20)
#define MaxICUVersion (U_ICU_VERSION_MAJOR_NUM + 30)
#define MinMinorICUVersion 1
#define MaxMinorICUVersion 5
#define MinSubICUVersion 1
Expand Down Expand Up @@ -244,14 +244,8 @@ static int FindLibWithMajorVersion(const char* versionPrefix, char* symbolName,
// ICU packaging documentation (http://userguide.icu-project.org/packaging)
// describes applications link against the major (e.g. libicuuc.so.54).

// Select the version of ICU present at build time.
if (OpenICULibraries(MinICUVersion, -1, -1, versionPrefix, symbolName, symbolVersion))
{
return TRUE;
}

// Select the highest supported version of ICU present on the local machine
for (int i = MaxICUVersion; i > MinICUVersion; i--)
for (int i = MaxICUVersion; i >= MinICUVersion; i--)
{
if (OpenICULibraries(i, -1, -1, versionPrefix, symbolName, symbolVersion))
{
Expand Down