diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b5aa68edf0c5fe..e62dfc5994b4b4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props - 11.0.0-alpha.1.25466.1 + 11.0.0-alpha.1.25556.1 4.9.0-rc2.21473.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f87ce0c64ca7a..160cd0f7f12fe1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/icu - 5974b6862e988bf6cfac08b2a8721e13aa955574 + 405615f119c1554d366b441870e29747e66c4dea https://github.com/dotnet/wcf diff --git a/src/mono/wasm/testassets/icudt_custom.dat b/src/mono/wasm/testassets/icudt_custom.dat index 703d9704375e08..adf1df910beeca 100644 Binary files a/src/mono/wasm/testassets/icudt_custom.dat and b/src/mono/wasm/testassets/icudt_custom.dat differ diff --git a/src/mono/wasm/testassets/incorrectName.dat b/src/mono/wasm/testassets/incorrectName.dat index 703d9704375e08..adf1df910beeca 100644 Binary files a/src/mono/wasm/testassets/incorrectName.dat and b/src/mono/wasm/testassets/incorrectName.dat differ diff --git a/src/native/libs/System.Globalization.Native/configure.cmake b/src/native/libs/System.Globalization.Native/configure.cmake index c749740951de57..096dac88a92bfb 100644 --- a/src/native/libs/System.Globalization.Native/configure.cmake +++ b/src/native/libs/System.Globalization.Native/configure.cmake @@ -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)