Skip to content

Upgrade to ICU 72.1.0.4 #121202

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
+10 −4
Open

Upgrade to ICU 72.1.0.4 #121202

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
34b71a5
Version updates from icu->runtiem subscription.
ilonatommy Oct 30, 2025
524aa1a
Fix deprecated APIs.
ilonatommy Oct 30, 2025
62a4dfe
Android uses its own system ICU
ilonatommy Oct 30, 2025
f2e1a67
Upgrade custom ICU files 68 -> 72.
ilonatommy Oct 30, 2025
524c7c7
Remove redundant changes.
ilonatommy Oct 31, 2025
d79da44
Cleanup.
ilonatommy Oct 31, 2025
8c0e780
Upgrade to the new prebuilts.
ilonatommy Nov 1, 2025
e5197ce
Update to ICU version without stack overflow.
ilonatommy Nov 4, 2025
5e513d3
Fix normalization and test expectations to match the BCP47 format.
ilonatommy Nov 5, 2025
d26bdfd
Revert test expectation changes.
ilonatommy Nov 6, 2025
afff9af
Revert normalization changes.
ilonatommy Nov 6, 2025
00c405d
Cleanup.
ilonatommy Nov 6, 2025
4ca6abb
Refresh ICU version.
ilonatommy Nov 6, 2025
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
2 changes: 1 addition & 1 deletion eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/icu dependencies -->
<MicrosoftNETCoreRuntimeICUTransportPackageVersion>11.0.0-alpha.1.25466.1</MicrosoftNETCoreRuntimeICUTransportPackageVersion>
<MicrosoftNETCoreRuntimeICUTransportPackageVersion>11.0.0-alpha.1.25530.2</MicrosoftNETCoreRuntimeICUTransportPackageVersion>
<!-- dotnet/wcf dependencies -->
<SystemServiceModelPrimitivesPackageVersion>4.9.0-rc2.21473.1</SystemServiceModelPrimitivesPackageVersion>
<!-- dotnet/llvm-project dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="c636320f4ab16760a81313f0222af1e4f3740aa9" BarId="288405" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="11.0.0-alpha.1.25466.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="11.0.0-alpha.1.25530.2">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>5974b6862e988bf6cfac08b2a8721e13aa955574</Sha>
<Sha>060989b6620f5493ef31afff1f6e77dff6fd9481</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down
Binary file modified src/mono/wasm/testassets/icudt_custom.dat
View file
Open in desktop
Binary file not shown.
Binary file modified src/mono/wasm/testassets/incorrectName.dat
View file
Open in desktop
Binary file not shown.
8 changes: 7 additions & 1 deletion src/native/libs/System.Globalization.Native/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
if(CLR_CMAKE_TARGET_ANDROID OR CLR_CMAKE_TARGET_APPLE OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
set(HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS 1)
set(HAVE_UCOL_CLONE 0)

# Android uses its own system ICU
if(CLR_CMAKE_TARGET_ANDROID)
set(HAVE_UCOL_CLONE 0)
else()
set(HAVE_UCOL_CLONE 1)
endif()
else()
include(CheckCSourceCompiles)
include(CheckSymbolExists)
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Globalization.Native/pal_collation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,11 @@ static UCollator* CloneCollatorWithOptions(const UCollator* pCollator, int32_t o
}
#else // !defined(STATIC_ICU)

#if HAVE_UCOL_CLONE
#if HAVE_UCOL_CLONE || (defined(U_ICU_VERSION_MAJOR_NUM) && U_ICU_VERSION_MAJOR_NUM >= 72)
pClonedCollator = ucol_clone(pCollator, pErr);
#else
pClonedCollator = ucol_safeClone(pCollator, NULL, NULL, pErr);
#endif // HAVE_UCOL_CLONE
#endif // HAVE_UCOL_CLONE || ICU version >= 72

#endif // !defined(STATIC_ICU)
}
Expand Down
Loading