Skip to content

Update ICU to 78 - Part 6: build and CI plumbing #187

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
aoruganti-msft wants to merge 5 commits into
base: user/aoruganti/icu78-patch-records
Choose a base branch
from
Open

Update ICU to 78 - Part 6: build and CI plumbing #187

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
8e36ac5
build(props): map VS 2026 (v145) toolset and enable latest-SDK alias
May 17, 2026
d221862
build(props): drop hardcoded 10.0.22621.0 SDK pinning for ARM/ARM64
May 17, 2026
39f2ac1
Fix Linux ICU CI build inputs
May 20, 2026
5ac6631
Classify upstream ICU source as CodeQL library
May 20, 2026
39a8ace
Use GitHub CodeQL config path
May 20, 2026
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
7 changes: 7 additions & 0 deletions .github/codeql/codeql-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: "CodeQL config"

paths-ignore:
# Upstream ICU source consumed by this fork. MSFT-owned patches live under icu-patches/.
- "icu/icu4c/**"
# Upstream ICU test data consumed with ICU source.
- "icu/testdata/**"
6 changes: 3 additions & 3 deletions build/dockerfiles/ubuntu-arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This uses the .NET Core Ubuntu 16.04 (xenial) Cross-ARM64 docker image to build.
# This uses the .NET Core Ubuntu 18.04 (bionic) Cross-ARM64 docker image to build.
# https://github.com/dotnet/dotnet-buildtools-prereqs-docker

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210106160011-b2c2436
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64

LABEL maintainer="Jeff Genovy <29107334+jefgen@users.noreply.github.com>"
LABEL com.github.microsoft.icu="ubuntu-16.04-cross-arm64"
LABEL com.github.microsoft.icu="ubuntu-18.04-cross-arm64"

# Remove icu-dev, so it doesn't conflict.
RUN apt-get -y remove libicu-dev icu-devtools
Expand Down
2 changes: 1 addition & 1 deletion icu/icu4c/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../LICENSE
../../LICENSE
6 changes: 4 additions & 2 deletions icu/icu4c/source/allinone/Build.Windows.PlatformToolset.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
v141 is the Visual Studio 2017 toolset. (15.0)
v142 is the Visual Studio 2019 toolset. (16.0)
v143 is the Visual Studio 2022 toolset. (17.0)
v145 is the Visual Studio 2026 toolset. (18.0)
-->
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='14.0'">v140</AutoDetectedPlatformToolset>
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='15.0'">v141</AutoDetectedPlatformToolset>
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='16.0'">v142</AutoDetectedPlatformToolset>
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='17.0'">v143</AutoDetectedPlatformToolset>
<AutoDetectedPlatformToolset Condition="'$(BuildToolVersion)'=='18.0'">v145</AutoDetectedPlatformToolset>
</PropertyGroup>
<PropertyGroup Label="EmptyDefaultPlatformToolset">
<DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == '' ">$(AutoDetectedPlatformToolset)</DefaultPlatformToolset>
Expand All @@ -32,11 +34,11 @@
If not already set, use the latest installed version of the Windows 10 SDK.
The Windows 10 SDK is backwards compatible to Windows 7, as long as WINVER and _WIN32_WINNT are set before compiling.
Note:
- With VS2019, VS2022 using a value of "10.0" means that it will use the latest installed version.
- With VS2019, VS2022, VS2026 using a value of "10.0" means that it will use the latest installed version.
- With VS2017, we need to manually detect the latest SDK version from the registry.
- With VS2015, use the Windows 8.1 SDK.
-->
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and ('$(PlatformToolset)'=='v142' or '$(PlatformToolset)'=='v143')">
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and ('$(PlatformToolset)'=='v142' or '$(PlatformToolset)'=='v143' or '$(PlatformToolset)'=='v145')">
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and ('$(PlatformToolset)'=='v141' or '$(AutodetectWin10SDK)'=='true')">
Expand Down
4 changes: 0 additions & 4 deletions icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,9 @@
Note: This version must match the version below in the ARM64 section for AdditionalLibraryDirectories
-->
<PropertyGroup Condition="'$(Platform)'=='ARM'">
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='ARM64'">
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -185,7 +183,6 @@
<!-- The ARM64 Desktop SDK doesn't include this by default -->
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<!-- Note: This needs to match the same version as WindowsTargetPlatformVersion for ARM -->
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22621.0\um\arm</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<!-- Options that are common to all ARM 64-bit configurations for *all* projects. -->
Expand All @@ -201,7 +198,6 @@
<!-- The ARM64 Desktop SDK doesn't include this by default -->
<AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<!-- Note: This needs to match the same version as WindowsTargetPlatformVersion for ARM64 -->
<AdditionalLibraryDirectories>C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22621.0\um\arm64</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>