Deprecate ICU ucol_safeClone and support ucol_clone #68847
Conversation
|
Tagging subscribers to this area: @dotnet/area-system-globalization Issue DetailsFixes #68814 The ICU API
|
|
I tested this locally and it works for me, thanks! |
|
@janvorli could you please help have a quick look at this one? |
|
/azp run runtime |
|
Azure Pipelines successfully started running 1 pipeline(s). |
tarekgh
added
the
NO-MERGE
tarekgh
removed
the
NO-MERGE
|
The failures in this PR are unrelated and tracked. |
|
/backport to release/6.0 |
|
@lewing is the bot down? |
|
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836 |
|
/backport to release/6.0 |
|
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664 I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work? |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196 |
|
@carlossanlop backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Deprecate ICU ucol_safeClone and support ucol_clone
Using index info to reconstruct a base tree...
A src/native/libs/System.Globalization.Native/configure.cmake
A src/native/libs/System.Globalization.Native/pal_collation.c
A src/native/libs/System.Globalization.Native/pal_icushim.c
A src/native/libs/System.Globalization.Native/pal_icushim_internal.h
A src/native/libs/System.Globalization.Native/pal_icushim_internal_android.h
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
CONFLICT (content): Merge conflict in src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_internal.h
Auto-merging src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
CONFLICT (content): Merge conflict in src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
Auto-merging src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate ICU ucol_safeClone and support ucol_clone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
* Bump the macOS image to one that isn't EOL yet * Backport #68847 and #58485 Co-authored-by: Steve Pfister <[email protected]>
ghost
locked as resolved and limited conversation to collaborators
5 participants
Fixes #68814
The ICU API
ucol_safeClonehas been deprecated in version71and it is recommended to use the newly introduced APIucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated APIucol_safeClone.The fix here is we'll try to probe to see if
ucol_cloneis defined and use it (means using ICU 71). Ifucol_cloneis not defined, we'll fallback to use the old, deprecated APIucol_safeClone(means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.