Skip to content

[mono] Test upgrading to ICU 72.3 #93756

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

Closed
wants to merge 5 commits into from
Closed

[mono] Test upgrading to ICU 72.3 #93756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a29ead
[mono] Test upgrading to ICU 72.3
Oct 19, 2023
e6a7f9b
Set HAVE_UCOL_CLONE and remove no-deprecated-declarations on ios
Oct 20, 2023
0555a40
Merge remote-tracking branch 'upstream/main' into stpfiste/test-icu-72.3
Oct 31, 2023
65d4b75
make sure icdt73 symbol is found
Oct 31, 2023
a9f299a
set HAVE_UCOL_CLONE in mono cmake
Oct 31, 2023
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
one as a template. The following line is a marker to insert the test restore sources.
-->
<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
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,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="9.0.0-alpha.1.23523.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="9.0.0-alpha.1.23519.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>88e9705dac4a4055b3ca924a9a23dca594bcd780</Sha>
<Sha>3c7a5b35c5cf077fbfa91a9538215453f61f770f</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="8.0.0-alpha.1.23166.1">
<Uri>https://github.com/dotnet/msquic</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<!-- ILCompiler -->
<MicrosoftDotNetILCompilerVersion>9.0.0-alpha.1.23529.4</MicrosoftDotNetILCompilerVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-alpha.1.23523.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-alpha.1.23519.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23180.2</SystemNetMsQuicTransportVersion>
Expand Down
7 changes: 6 additions & 1 deletion src/mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ elseif(HOST_BROWSER)
set(STATIC_ICU 1)
set(ICU_LIBS "icucore")
elseif(HOST_IOS OR HOST_TVOS OR HOST_MACCAT)
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations")
set(ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option")
set(HAVE_SYS_ICU 1)
set(STATIC_ICU 1)
set(ICU_LIBS icuuc icui18n icudata)
Expand Down Expand Up @@ -779,6 +779,11 @@ else()
message(FATAL_ERROR "Unknown host")
endif()

# Ensure we aren't using deprecated ICU functions
if(STATIC_ICU)
set(ICU_FLAGS "-DHAVE_UCOL_CLONE ${ICU_FLAGS}")
endif()

######################################
# GC CHECKS
######################################
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/runtime/es6/dotnet.es6.lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function setup(linkerSetup) {

const DotnetSupportLib = {
$DOTNET: { setup },
icudt68_dat: function () { throw new Error('dummy link symbol') },
icudt73_dat: function () { throw new Error('dummy link symbol') },
};

function createWasmImportStubsFrom(collection) {
Expand Down
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,7 +1,13 @@
if(CLR_CMAKE_TARGET_ANDROID OR CLR_CMAKE_TARGET_APPLE OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
set(HAVE_SET_MAX_VARIABLE 1)
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