diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml new file mode 100644 index 00000000000..ea1888eed44 --- /dev/null +++ b/.github/codeql/codeql-config.yml @@ -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/**" diff --git a/build/dockerfiles/ubuntu-arm64/Dockerfile b/build/dockerfiles/ubuntu-arm64/Dockerfile index 8366d2d79a1..5f5d8980621 100644 --- a/build/dockerfiles/ubuntu-arm64/Dockerfile +++ b/build/dockerfiles/ubuntu-arm64/Dockerfile @@ -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 diff --git a/icu/icu4c/LICENSE b/icu/icu4c/LICENSE index ea5b60640b0..30cff7403da 120000 --- a/icu/icu4c/LICENSE +++ b/icu/icu4c/LICENSE @@ -1 +1 @@ -../LICENSE \ No newline at end of file +../../LICENSE \ No newline at end of file diff --git a/icu/icu4c/source/allinone/Build.Windows.PlatformToolset.props b/icu/icu4c/source/allinone/Build.Windows.PlatformToolset.props index 29a9a1d8e6d..c22994b7ef8 100644 --- a/icu/icu4c/source/allinone/Build.Windows.PlatformToolset.props +++ b/icu/icu4c/source/allinone/Build.Windows.PlatformToolset.props @@ -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) --> v140 v141 v142 v143 + v145 $(AutoDetectedPlatformToolset) @@ -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. --> - + 10.0 diff --git a/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props b/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props index a9303482463..ae3e391ce65 100644 --- a/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props +++ b/icu/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props @@ -63,11 +63,9 @@ Note: This version must match the version below in the ARM64 section for AdditionalLibraryDirectories --> - 10.0.22621.0 true - 10.0.22621.0 true @@ -185,7 +183,6 @@ kernel32.lib;%(AdditionalDependencies) - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22621.0\um\arm @@ -201,7 +198,6 @@ kernel32.lib;%(AdditionalDependencies) - C:\Program Files (x86)\Windows Kits\10\Lib\10.0.22621.0\um\arm64 \ No newline at end of file