Skip to content

Deprecate ICU ucol_safeClone and support ucol_clone - #68847

Merged
tarekgh merged 4 commits into
dotnet:mainfrom
tarekgh:EnableICUColClone
May 6, 2022
Merged

Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom
tarekgh:EnableICUColClone

Conversation

@tarekgh

@tarekghtarekgh commented May 4, 2022

Copy link
Copy Markdown
Member

Fixes#68814

The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.
The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.

@ghostghost assigned tarekghMay 4, 2022
@ghost

ghost commented May 4, 2022

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #68814

The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.
The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.

Author:tarekgh
Assignees:-
Labels:

area-System.Globalization

Milestone:-

@tarekgh

tarekgh commented May 4, 2022

Copy link
Copy Markdown
MemberAuthor

CC @ManickaP@danmoseley@janvorli

@tarekghtarekgh added this to the 7.0.0 milestone May 4, 2022
@ManickaP

ManickaP commented May 4, 2022

Copy link
Copy Markdown
Member

I tested this locally and it works for me, thanks!

@tarekgh

tarekgh commented May 4, 2022

Copy link
Copy Markdown
MemberAuthor

@janvorli could you please help have a quick look at this one?

janvorli
janvorli reviewed May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli approved these changes May 4, 2022
View reviewed changes

@janvorlijanvorli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@tarekgh
tarekghforce-pushed the EnableICUColClone branch from 75746c0 to bdba2edCompareMay 5, 2022 00:18
@tarekgh

tarekgh commented May 5, 2022

Copy link
Copy Markdown
MemberAuthor

/azp run runtime

@azure-pipelines

azure-pipelinesBot commented May 5, 2022

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@tarekghtarekgh added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label May 5, 2022
@tarekghtarekgh removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label May 6, 2022
@tarekghtarekgh mentioned this pull request May 6, 2022
Closed
@tarekgh

tarekgh commented May 6, 2022

Copy link
Copy Markdown
MemberAuthor

The failures in this PR are unrelated and tracked.

@tarekgh
tarekgh merged commit 18d8935 into dotnet:mainMay 6, 2022
@tarekgh
tarekgh deleted the EnableICUColClone branch May 6, 2022 16:43
@ghostghost locked as resolved and limited conversation to collaborators Jun 5, 2022
@hoyosjshoyosjs mentioned this pull request Sep 8, 2022
Merged
@lewing

lewing commented Sep 8, 2022

Copy link
Copy Markdown
Member

/backport to release/6.0

@lewinglewing mentioned this pull request Sep 8, 2022
Merged
@carlossanlop

carlossanlop commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

@lewing is the bot down?

@carlossanlop

carlossanlop commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836
Maybe a retry could work.

@carlossanlop

carlossanlop commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

/backport to release/6.0

@carlossanlop

carlossanlop commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664

[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?

@dotnetdotnet unlocked this conversation Sep 8, 2022
@carlossanlop

carlossanlop commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

/backport to release/6.0

@github-actions

github-actionsBot commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196

@github-actions

github-actionsBot commented Sep 8, 2022

Copy link
Copy Markdown
Contributor

@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 128

Please backport manually!

steveisok pushed a commit to lewing/runtime that referenced this pull request Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit to ayakael/runtime that referenced this pull request Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael mentioned this pull request Sep 13, 2022
Closed
carlossanlop pushed a commit that referenced this pull request Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects

None yet

Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1

5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Deprecate ICU ucol_safeClone and support ucol_clone by tarekgh · Pull Request #68847 · dotnet/runtime · GitHub
Skip to content
Deprecate ICU ucol_safeClone and support ucol_clone - #68847
Merged
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
May 6, 2022
Merged
Deprecate ICU ucol_safeClone and support ucol_clone#68847
tarekgh merged 4 commits into
dotnet:mainfrom 
tarekgh:EnableICUColClone
Conversation
@tarekgh
@tarekghtarekgh
commented
May 4, 2022

Copy link


Copy Markdown

Member
Fixes#68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
@ghostghost
assigned tarekghMay 4, 2022
@ghost
ghost
commented
May 4, 2022

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-globalization

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #68814
The ICU API ucol_safeClone has been deprecated in version 71 and it is recommended to use the newly introduced API ucol_clone. This means when building our runtime using ICU 71 headers, it will cause a build break because it will recognize using deprecated API ucol_safeClone.

The fix here is we'll try to probe to see if ucol_clone is defined and use it (means using ICU 71). If ucol_clone is not defined, we'll fallback to use the old, deprecated API ucol_safeClone (means using ICU version less than 71). We do this probe either dynamically or statically linking to ICU libraries.
Author:tarekgh
Assignees:-
Labels:
area-System.Globalization
Milestone:-
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
CC @ManickaP@danmoseley@janvorli
@tarekghtarekgh
added this to the 7.0.0 milestone
May 4, 2022
@ManickaP
ManickaP
commented
May 4, 2022

Copy link


Copy Markdown

Member
I tested this locally and it works for me, thanks!
@tarekgh
tarekgh
commented
May 4, 2022

Copy link


Copy Markdown

MemberAuthor
@janvorli could you please help have a quick look at this one?
janvorli
janvorli
reviewed
May 4, 2022
View reviewed changes
Comment threadsrc/native/libs/System.Globalization.Native/pal_collation.c
janvorli
janvorli
approved these changes
May 4, 2022
View reviewed changes
@janvorlijanvorli
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM, thank you!
@tarekgh
tarekghforce-pushed
the
EnableICUColClone
branch
from
75746c0 to
bdba2edCompareMay 5, 2022 00:18
@tarekgh
tarekgh
commented
May 5, 2022

Copy link


Copy Markdown

MemberAuthor
/azp run runtime
@azure-pipelines
azure-pipelinesBot
commented
May 5, 2022

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@tarekghtarekgh
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 5, 2022
@tarekghtarekgh
removed
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
May 6, 2022
@tarekghtarekgh
mentioned this pull request
May 6, 2022

Closed

@tarekgh
tarekgh
commented
May 6, 2022

Copy link


Copy Markdown

MemberAuthor
The failures in this PR are unrelated and tracked.
@tarekgh
tarekgh
merged commit 18d8935
into
dotnet:mainMay 6, 2022
@tarekgh
tarekgh
deleted the

EnableICUColClone

branch
May 6, 2022 16:43
@ghostghost
locked as resolved and limited conversation to collaborators
Jun 5, 2022
@hoyosjshoyosjs
mentioned this pull request
Sep 8, 2022
 Merged

@lewing
lewing
commented
Sep 8, 2022

Copy link


Copy Markdown

Member
/backport to release/6.0
@lewinglewing
mentioned this pull request
Sep 8, 2022
 Merged

@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@lewing is the bot down?
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Hmm your backport request was skipped: https://github.com/dotnet/runtime/actions/runs/3018566836

Maybe a retry could work.
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
My attempt threw an error: https://github.com/dotnet/runtime/actions/runs/3018860664
[backport](https://github.com/dotnet/runtime/runs/8260481022?check_suite_focus=true#step:3:18)
Unhandled error: HttpError: Unable to create comment because issue is locked.

I am not sure what that means. Does the issue this PR is fixing have to be open for a backport to work?
@dotnetdotnet
unlocked this conversation
Sep 8, 2022
@carlossanlop
carlossanlop
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
/backport to release/6.0
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3018899196
@github-actions
github-actionsBot
commented
Sep 8, 2022

Copy link


Copy Markdown

Contributor
@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 128
Please backport manually!
steveisok pushed a commit
to lewing/runtime
that referenced
this pull request
Sep 12, 2022
Steve Pfister
Backportdotnet#68847anddotnet#58485
64a2ea7
ayakael added a commit
to ayakael/runtime
that referenced
this pull request
Sep 13, 2022
@ayakael
Deprecate ICU ucol_safeClone and support ucol_clone (backport ofdotn…
77942a9
…et#68847)
@ayakaelayakael
mentioned this pull request
Sep 13, 2022
 Closed

carlossanlop pushed a commit
that referenced
this pull request
Sep 13, 2022
@lewingSteve Pfister
[release/6.0] Bump the macOS image to one that isn't EOL yet (#75294)
bc65e68
* Bump the macOS image to one that isn't EOL yet
* Backport #68847 and #58485
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@tarekghtarekgh

Labels

area-System.Globalization

Projects


None yet


Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

ucol_safeClone deprecated in ICU 71.1


5 participants

@tarekgh@ManickaP@lewing@carlossanlop@janvorli