Skip to content

Commit 690c3e7

Browse files
authored
Merge pull request #22169 from ramezgerges/uno_icu_win
chore: use Uno.icu-win instead of Microsoft.ICU.ICU4C.Runtime
2 parents 25b2294 + ce24a01 commit 690c3e7

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/Directory.Build.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<MicrosoftTestingPlatformVersion>1.9.0</MicrosoftTestingPlatformVersion>
7777
<SkiaSharpVersion>3.119.0</SkiaSharpVersion>
7878
<HarfbuzzSharpVersion>8.3.1.1</HarfbuzzSharpVersion>
79-
<UnoICUVersion>77.1.0-dev.46</UnoICUVersion>
79+
<UnoICUVersion>77.1.0-dev.65</UnoICUVersion>
8080
</PropertyGroup>
8181

8282
<ItemGroup>
@@ -178,6 +178,7 @@
178178
<PackageReference Update="Uno.icu-macos" Version="$(UnoICUVersion)" />
179179
<PackageReference Update="Uno.icu-wasm" Version="$(UnoICUVersion)" />
180180
<PackageReference Update="Uno.icu-ios" Version="$(UnoICUVersion)" />
181+
<PackageReference Update="Uno.icu-win" Version="$(UnoICUVersion)" />
181182
</ItemGroup>
182183

183184
<Target Name="ValidateSolutionPath" BeforeTargets="Build">

src/Uno.UI.Runtime.Skia.Win32/Uno.UI.Runtime.Skia.Win32.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
3131
<PackageReference Include="HarfBuzzSharp" />
32-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
32+
<PackageReference Include="Uno.icu-win" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="Microsoft.Web.WebView2" Aliases="WpfWebView" PrivateAssets="all" />
32-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
32+
<PackageReference Include="Uno.icu-win" />
3333

3434
<!--
3535
Required to ensure that this reference is latest and not

src/Uno.UI/UI/Xaml/Documents/UnicodeText.ICU.skia.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ static unsafe ICU()
3232
IntPtr libicuuc;
3333
if (OperatingSystem.IsWindows())
3434
{
35-
// On Windows, We get the ICU binaries from the Microsoft.ICU.ICU4C.Runtime package
36-
_icuVersion = 72;
37-
if (!NativeLibrary.TryLoad("icuuc72", typeof(ICU).Assembly, NativeLibrarySearchDirectories, out libicuuc))
35+
// On Windows, we get the ICU binaries from the uno.icu-win package.
36+
_icuVersion = 77;
37+
if (!NativeLibrary.TryLoad("icuuc77", typeof(ICU).Assembly, NativeLibrarySearchDirectories, out libicuuc))
3838
{
3939
throw new Exception("Failed to load libicuuc.");
4040
}

0 commit comments

Comments
 (0)